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

src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue

@@ -154,6 +154,7 @@ export default {
   methods: {
     // 查询表格数据
     searchTable() {
+      console.log(this.id, this.name)
       this.loading = true
       this.tableData = []
       this.Data = []
@@ -189,7 +190,7 @@ export default {
     // 自家备料出库
     handleChange1(row) {
       change(row.工艺计划流水号, row.重量, row.单价).then(() => {
-        handlechange(row.工序流水号, this.id)
+        handlechange(row.工序流水号, '0000')
       }).then(response => {
         this.searchTable()
       })
@@ -240,7 +241,7 @@ export default {
           this.bianliang1.push(this.arrest[i].工艺计划流水号)
           this.bianliang2.push(this.arrest[i].工序流水号)
         }
-        change2(this.bianliang2, this.id, this.bianliang1).then(response => {
+        change2(this.bianliang2, '0000', this.bianliang1).then(response => {
           this.searchTable2()
         })
       }

src/views/ManufacturingCenter/QuotaFormulation/index.vue

@@ -22,7 +22,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin: 10px" @click="typeChange()">查询</el-button>
+        <!--<el-button type="success" size="small" icon="el-icon-search" style="margin: 10px" @click="typeChange()">查询</el-button>-->
         <span v-if="radio === 1" style="color: #53A3F7;font-size: 14px"> 未编制的数量{{ partNum.length }}</span>
         <span v-if="radio === 2" style="color: #53A3F7;font-size: 14px"> {{ shuliang }}</span>
       </div>

src/views/ManufacturingCenter/machiningHoursStatistics/index.vue

@@ -0,0 +1,44 @@
+<template>
+  <div class="app-container">
+
+    <el-card>
+      <el-row>
+        <span class="demonstration">完成加工时间:</span>
+        <el-date-picker
+          v-model="startTime"
+          value-format="yyyy-MM-dd"
+          size="small"
+          style="width: 160px"
+          type="date"
+          placeholder="选择日期"/>
+        <span class="demonstration">~</span>
+        <el-date-picker
+          v-model="endTime"
+          value-format="yyyy-MM-dd"
+          size="small"
+          style="width: 160px"
+          type="date"
+          placeholder="选择日期"/>
+        <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=10;total = 0;getTableData();">查询</el-button>
+      </el-row>
+    </el-card>
+  </div>
+</template>
+<script>
+import {} from '@/api/ManufacturingCenter/machiningHoursStatistics'
+
+export default {
+  data() {
+    return {
+      startTime: '',
+      endTime: ''
+    }
+  },
+  created() {},
+  methods: {}
+}
+</script>
+
+<style scoped>
+
+</style>