fix: 保密方案调整

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

@@ -562,17 +562,18 @@
             <el-input v-model="form.moduleNum" placeholder />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :lg="6" :md="8" :sm="12" :xs="12">
-          <el-form-item label="排版方式" prop="dta">
-            <el-select v-model="form.dta" placeholder="请选择是否DTA排版" disabled >
-                <el-option v-for="item in dtaOptions" :key="item.value" :label="item.name"
-                  :value="item.value"></el-option>
-              </el-select>
+          <el-form-item label="油墨系数" prop="printinginkCoefficient">
+            <el-input v-model="form.printinginkCoefficient" placeholder />
+          </el-form-item>
+        </el-col>
+        <el-col :lg="6" :md="8" :sm="12" :xs="12">
+          <el-form-item label="粒子系数" prop="particleCoefficient">
+            <el-input v-model="form.particleCoefficient" placeholder />
           </el-form-item>
         </el-col>
-
-      </el-row>
-      <el-row>
         <el-col :lg="6" :md="8" :sm="12" :xs="12">
           <el-form-item label="排版方式" prop="dta">
             <el-select v-model="form.dta" placeholder="请选择是否DTA排版" disabled >
@@ -760,6 +761,8 @@ export default {
         remark: "",
         dtaRemark: "",
         dta: "",
+        printinginkCoefficient: "",
+        particleCoefficient: "",
       },
       currentRow: {},
       currentRowIndex: undefined,

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

@@ -45,6 +45,13 @@
                         ></el-option>
                 </el-select>
             </el-form-item>
+            <el-col :span="8">
+              <el-form-item label="需求日期" prop="requestDate">
+                <el-date-picker clearable v-model="form.requestDate" type="date" value-format="yyyy-MM-dd"
+                  placeholder="请选择需求日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -64,7 +71,7 @@
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="informationList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="informationList" :summary-method="getSummaries" show-summary @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="组合单号" align="center" prop="combinationCode" />
         <el-table-column label="生产工单" align="center" prop="workorderCode" />
@@ -76,8 +83,23 @@
         <el-table-column label="物料编码" align="center" prop="sapItemCode" />
         <el-table-column label="物料名称" align="center" prop="itemName" />
         <el-table-column label="数量" align="center" prop="quantity" />
+        <el-table-column label="油墨重量（KG）" align="center" prop="printinginkCoefficient">
+          <template slot-scope="scope">
+            <span>{{ scope.row.printinginkCoefficient ? scope.row.quantity * scope.row.printinginkCoefficient : 0 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="粒子重量（KG）" align="center" prop="particleCoefficient">
+          <template slot-scope="scope">
+            <span>{{ scope.row.particleCoefficient ? scope.row.quantity * scope.row.particleCoefficient : 0 }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="工艺编码" align="center" prop="seRouteCode" />
         <el-table-column label="工艺描述" align="center" prop="seRouteDesc" />
+        <el-table-column label="需求日期" align="center" prop="requestDate" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
             <el-button
@@ -155,7 +177,6 @@
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
-
                 </el-row>
             </el-form>
             <el-divider content-position="center">申请单物料</el-divider>
@@ -203,13 +224,16 @@ export default {
         open: false,
         // 查询参数
         queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-            itemName: null,
-            statusList: [],
-            seRouteCode: null,
-            sapItemCode: null,
-            abnormalType: null,        workorderCode: null,      },
+          pageNum: 1,
+          pageSize: 10,
+          itemName: null,
+          statusList: [],
+          seRouteCode: null,
+          sapItemCode: null,
+          abnormalType: null,
+          workorderCode: null,
+          requestDate: null,
+        },
         // 表单参数
         form: {},
         // 表单校验
@@ -322,6 +346,41 @@ export default {
             this.single = selection.length!==1
             this.multiple = !selection.length
         },
+        getSummaries(param){
+          const { columns, data } = param
+          const sums = []
+          columns.forEach((column, index) => {
+            if (index === 1) {
+              sums[index] = '总数量'
+            } else if (column.label === '数量') {
+              const temp = data.reduce((prev, curr) => {
+                return prev + Number(curr.quantity);
+              }, 0)
+              sums[index] =  Number.isInteger(temp) ? temp : temp.toFixed(6);
+            } else if (column.label === '油墨重量（KG）') {
+              const temp = data.reduce((prev, curr) => {
+                if(curr.printinginkCoefficient > 0) {
+                  return prev + Number(curr.quantity * curr.printinginkCoefficient);
+                } else {
+                  return prev + 0
+                }
+              }, 0)
+              sums[index] =  Number.isInteger(temp) ? temp : temp.toFixed(6);
+            } else if (column.label === '粒子重量（KG）') {
+              const temp = data.reduce((prev, curr) => {
+                if(curr.particleCoefficient > 0) {
+                  return prev + Number(curr.quantity * curr.particleCoefficient);
+                } else {
+                  return prev + 0
+                }
+              }, 0)
+              sums[index] =  Number.isInteger(temp) ? temp : temp.toFixed(6);
+            } else {
+              sums[index] = ''
+            }
+          })
+          return sums
+        },
         handleWorkstationSelect() {
             this.$refs.workstationSelect.showFlag = true;
         },