Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/api/mes/pro/feedback.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询生产报工记录列表
 export function listFeedback(query) {
   return request({
-    url: '/mes/pro/feedback/list',
+    url: '/mes/pro/feedback/listRePort',
     method: 'get',
     params: query
   })

src/views/mes/pro/feedback/index.vue

@@ -7,6 +7,10 @@
             :value="dict.value" />
         </el-select>
       </el-form-item>
+      <el-form-item label="编排单号" prop="arrangeCode">
+        <el-input v-model="queryParams.arrangeCode" placeholder="请输入编排单号" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item label="工作中心名称" prop="workstationName">
         <el-input v-model="queryParams.workstationName" placeholder="请输入工作中心名称" clearable
           @keyup.enter.native="handleQuery" />
@@ -57,13 +61,14 @@
        -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <el-table v-loading="loading" :data="feedbackList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="feedbackList" @selection-change="handleSelectionChange" show-summary :summary-method="getSummaries">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="报工类型" align="center" width="80" prop="feedbackType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mes_feedback_type" :value="scope.row.feedbackType" />
         </template>
       </el-table-column>
+      <el-table-column label="编排单号" width="120" align="center" prop="arrangeCode" />
       <el-table-column label="工作中心" width="120" align="center" prop="workstationName" />
       <el-table-column label="工作单元" width="120" align="center" prop="workunitName" />
       <el-table-column label="外协单号" width="150" align="center" prop="assistProcessCode" />
@@ -282,7 +287,7 @@ export default {
       total: 0,
       // 生产报工记录表格数据
       feedbackList: [],
-
+      totalSum: [],
       selectRow: [],
       // 弹出层标题
       title: "",
@@ -316,6 +321,7 @@ export default {
         userName: null,
         nickName: null,
         feedbackChannel: null,
+        arrangeCode: null,
         machineTime: 0,
         recordUser: null,
         recordNick: null,
@@ -353,6 +359,23 @@ export default {
     this.getList();
   },
   methods: {
+    getSummaries(param){
+    const { columns, data } = param
+    const sums = []
+    columns.forEach((column, index) => {
+      if (index === 1) {
+        sums[index] = '合计'
+      } else if (['quantityQualify', 'quantityUnqualify'].indexOf(column.property) > -1) {
+        sums[index] = this.totalSum[column.property]
+      } else if (column.label === '报工数量') {
+        sums[index] = (this.totalSum['quantityQualify'] ? Number(this.totalSum['quantityQualify']) : 0)  + (this.totalSum['quantityUnqualify'] ? Number(this.totalSum['quantityUnqualify']) : 0)
+      } else {
+        sums[index] = ''
+      }
+    })
+
+    return sums
+  },
     getSumNumber(row) {
       const first = row.quantityQualify ? Number(row.quantityQualify) : 0
       const last = row.quantityUnqualify ? Number(row.quantityUnqualify) : 0
@@ -362,7 +385,8 @@ export default {
     getList() {
       this.loading = true;
       listFeedback(this.queryParams).then(response => {
-        this.feedbackList = response.rows;
+        this.feedbackList = response.rows.slice(0, response.rows.length - 1);
+        this.totalSum = response.rows[response.rows.length - 1]
         this.total = response.total;
         this.loading = false;
       });

src/views/mes/pro/productionSolution/components/ProogingSpecificationSheet.vue

@@ -123,6 +123,15 @@
             </el-input>
           </el-form-item>
         </el-col>
+        <el-col :lg="6" :md="8" :sm="12" :xs="12">
+          <el-form-item label="厚度mm" prop="thick">
+            <el-input
+              v-model="form.thick"
+              placeholder
+              type="number"
+              :precision="2" />
+          </el-form-item>
+        </el-col>
         <el-col :lg="6" :md="8" :sm="12" :xs="12"
           ><el-form-item label="印张长度" prop="printingPaperlenth"
             ><el-input
@@ -709,6 +718,7 @@ export default {
         layerNum: "",
         width: "",
         height: "",
+        thick:"",
         printingPaperlenth: "",
         printPaperwidth: "",
         sendworkMultiple: "",
@@ -731,7 +741,6 @@ export default {
         backImg: "",
         blownFilmWidth: "",
         blownFilmThickness: "",
-        printPaperwidth: "",
         inlay: "",
         customerConfirmedBy: "",
         customerConfirmedDate: "",
@@ -808,6 +817,7 @@ export default {
         layerNum: "",
         width: "",
         height: "",
+        thick: "",
         printingPaperlenth: "",
         printPaperwidth: "",
         sendworkMultiple: "",
@@ -830,7 +840,6 @@ export default {
         backImg: "",
         blownFilmWidth: "",
         blownFilmThickness: "",
-        printPaperwidth: "",
         inlay: "",
         customerConfirmedBy: "",
         customerConfirmedDate: "",

src/views/mes/pro/scheduleLog/index.vue

@@ -148,11 +148,16 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        orderByColumn:'createTime',
+        isAsc:'desc'
+      }
       this.resetForm("queryForm");
       this.handleQuery();
     },