Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

src/views/ManufacturingCenter/CreatePreparationBill/index.vue

@@ -0,0 +1,166 @@
+<template>
+  <div>
+    <el-card>
+      <el-row>
+        <span>零件图号:</span>
+        <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/>
+        <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
+        <el-checkbox v-model="all" size="mini">查询全部</el-checkbox>
+        <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="downLoad('BL');edit()">导出备料单</el-button>
+      </el-row>
+    </el-card>
+
+    <el-card>
+      <el-table v-loading="loading" :data="tableData" height="580" style="width: 100%;" border element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center"/>
+        <el-table-column label="打印状态" width="100" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.备料打印!=='0'" type="success" size="small">已导出</el-tag>
+            <el-tag v-else type="warning" size="small">未导出</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="零件名称" align="center" width="220px">
+          <template slot-scope="scope">
+            {{ scope.row.零件名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件图号" align="center" width="240px">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备料" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.工艺要求 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 40, 100]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+
+    <table id="BL" border cellspacing="0px" style="table-layout: fixed; width: 600px;display: none">
+      <colgroup>
+        <col style="width: 100px">
+        <col style="width: 150px">
+        <col style="width: 450px">
+      </colgroup>
+      <tr>
+        <th height="60px">GAOJING</th>
+        <th colspan="2" height="60px"><span style="font-weight:bold">备料单</span></th>
+      </tr>
+      <tr>
+        <td align="center">零件名称</td>
+        <td align="center">零件图号</td>
+        <td align="center">备料</td>
+      </tr>
+      <tr v-for="(list, index) in tableData2" :key="index">
+        <td align="center">{{ list.零件名称 }}</td>
+        <td align="center">{{ list.零件图号 }}</td>
+        <td>{{ list.工艺要求 }}</td>
+      </tr>
+    </table>
+
+  </div>
+</template>
+
+<script>
+import { searchtable, searchtable2, edit } from '@/api/ManufacturingCenter/CreatePreparationBill'
+import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
+export default {
+  data() {
+    return {
+      tableData2: [],
+      partName: '',
+      all: false,
+      loading: false,
+      Data: [],
+      tableData: [], // 表格数据
+      total: null, // 总条数
+      pageSize: 10, // 每页显示条数
+      pageCurrent: 1 // 后台获取页
+    }
+  },
+  created() {
+    this.searchTable()
+  },
+  methods: {
+    // 查询表格数据
+    searchTable() {
+      this.loading = true
+      this.tableData = []
+      this.Data = []
+      if (this.partName !== '' && this.partName !== null) {
+        this.partNamecheck = true
+      } else {
+        this.partNamecheck = false
+      }
+      searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize).then(response => {
+        if (response.data.total === 0) {
+          this.loading = false
+        } else {
+          this.Data = response.data.rows
+          this.total = response.data.total
+        }
+      }).then(() => {
+        for (let i = 0; i < this.Data.length; i++) {
+          searchtable2(this.Data[i].工艺计划流水号).then(response => {
+            this.tableData.push({
+              零件名称: this.Data[i].零件名称,
+              零件图号: this.Data[i].零件图号,
+              备料打印: this.Data[i].备料打印,
+              工艺要求: response.data[i].工艺要求
+            })
+          })
+          this.loading = false
+        }
+      })
+    },
+    handleSelectionChange(val) {
+      this.tableData2 = []
+      this.tableData2 = val
+    },
+    edit() {
+      for (let i = 0; i < this.tableData2.length; i++) {
+        edit(this.tableData2[i].工艺计划流水号)
+      }
+    },
+    downLoad(tableid) {
+      if (this.tableData2.length === 0) {
+        this.$message.warning('暂无数据')
+      } else {
+        this.searchTable()
+        getExplorer()
+        method5(tableid)
+        Cleanup()
+      }
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchTable()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchTable()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ManufacturingCenter/InitialProduction/index.vue

@@ -86,7 +86,7 @@
             </el-col>
             <el-col :span="1" class="line">～</el-col>
             <el-col :span="11">
-              <el-date-picker v-model="time_machiningFinish" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
+              <el-date-picker v-model="time_machiningFinish" default-time="23:59:59" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
             </el-col>
           </el-form-item>
         </el-form>

src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue

@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <el-card>
+      <el-row>
+        <span>零件图号:</span>
+        <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/>
+        <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
+        <el-checkbox v-model="all" size="mini" @change="searchTable">查询全部</el-checkbox>
+        <el-button :disabled="all" size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">到货</el-button>
+      </el-row>
+    </el-card>
+
+    <el-card>
+      <el-table v-loading="loading" :data="tableData" height="580" style="width: 100%;" border element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center"/>
+        <el-table-column label="到货状态" width="100" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.备料到货==='1'" type="success" size="small">已到货</el-tag>
+            <el-tag v-if="scope.row.备料到货==='0'" type="warning" size="small">未到货</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="零件名称" align="center" width="220px">
+          <template slot-scope="scope">
+            {{ scope.row.零件名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件图号" align="center" width="240px">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备料" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.工艺要求 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 40, 100]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import { searchtable, searchtable2, edit, handlechange } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
+export default {
+  data() {
+    return {
+      arrest: [],
+      all: false,
+      partName: '',
+      loading: false,
+      tableData: [], // 表格数据
+      total: null, // 总条数
+      pageSize: 10, // 每页显示条数
+      pageCurrent: 1 // 后台获取页
+    }
+  },
+  created() {
+    this.searchTable()
+  },
+  methods: {
+    // 查询表格数据
+    searchTable() {
+      this.loading = true
+      this.tableData = []
+      this.Data = []
+      if (this.partName !== '' && this.partName !== null) {
+        this.partNamecheck = true
+      } else {
+        this.partNamecheck = false
+      }
+      searchtable(this.partNamecheck, this.partName, !this.all, this.pageCurrent, this.pageSize).then(response => {
+        if (response.data.total === 0) {
+          this.loading = false
+        } else {
+          this.Data = response.data.rows
+          this.total = response.data.total
+        }
+      }).then(() => {
+        for (let i = 0; i < this.Data.length; i++) {
+          searchtable2(this.Data[i].工艺计划流水号).then(response => {
+            this.tableData.push({
+              工艺计划流水号: this.Data[i].工艺计划流水号,
+              零件名称: this.Data[i].零件名称,
+              零件图号: this.Data[i].零件图号,
+              备料到货: this.Data[i].备料到货,
+              工艺要求: response.data[i].工艺要求,
+              工序流水号: response.data[i].工序流水号
+            })
+          })
+          this.loading = false
+        }
+      })
+    },
+    handleSelectionChange(val) {
+      this.arrest = val
+    },
+    edit() {
+      if (this.arrest.length === 0) {
+        this.$message.warning('请选择零件')
+      } else {
+        for (let i = 0; i < this.arrest.length; i++) {
+          edit(this.arrest[i].工艺计划流水号)
+          handlechange(this.arrest[i].工序流水号, '0000')
+          if (i === this.arrest.length - 1) {
+            this.searchTable()
+          }
+        }
+      }
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchTable()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchTable()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue

@@ -605,6 +605,7 @@ export default {
   },
   created() {
     this.fetchData()
+    this.searchData()
   },
   methods: {
     fetchData() {
@@ -617,7 +618,6 @@ export default {
     searchData() {
       this.loading = true
       search(this.pageCurrent, this.pageSize, this.PrNum).then(response => {
-        console.log(response.data)
         this.tableData = response.data.rows
         this.total = response.data.total
         this.loading = false