Merge remote-tracking branch 'origin/master'

src/views/mes/reportWork/index.vue

@@ -529,6 +529,8 @@
 									type="date"></el-date-picker>
 							</template>
 						</el-table-column>
+            <el-table-column label="已过账数量" width="250" align="left" prop="sapquantity"
+                             :show-overflow-tooltip="true" :formatter="formatSapQuantity" />
 						<el-table-column label="SAP过账状态" width="100" align="center" prop="sapstatus">
 							<template slot-scope="scope">
 								<span v-if="scope.row.sapstatus === '1'">完成</span>
@@ -870,6 +872,10 @@ export default {
       this.queryParams.feedbackTimeArray.push(start, end);
       this.getList();
     },
+    formatSapQuantity(row, column, cellValue) {
+      // 去掉末尾的零
+      return cellValue.toString().replace(/\.?0+$/, '');
+    },
     Fungetdate(num) {
       var dd = new Date();
       dd.setDate(dd.getDate() + num);

src/views/wms/systemFinished/index.vue

@@ -139,7 +139,7 @@
         <el-table v-loading="loading" :data="systemFinishedList" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="55" align="center"/>
 
-                    <el-table-column label="ID" align="center" prop="ID" v-if="false" />
+                    <el-table-column label="id" align="center" prop="id" v-if="false" />
                     <el-table-column label="盘点单号" align="center" prop="orderCode"/>
                     <el-table-column label="工厂编码" align="center" prop="siteCode"  />
                     <el-table-column label="型号编码" align="center" prop="materialCode"v-if="false" />
@@ -147,10 +147,11 @@
                     <el-table-column label="库存数量" align="center" prop="locNumber"v-if="false" />
                     <el-table-column label="单位" align="center" prop="Unit"v-if="false" />
                     <el-table-column label="实际数量" align="center" prop="realityNumber"v-if="false" />
-                    <el-table-column label="盘点单状态" align="center" prop="orderStatus"/>
+<!--          订单状态0是待盘点，1是待调整，2是驳回，3是已完成-->
+                    <el-table-column label="盘点单状态" align="center" prop="orderStatus"  :formatter="formatOrderStatus"/>
                     <el-table-column label="盘点仓库" align="center" prop="userDefined1"/>
                     <el-table-column label="盘点位置" align="center" prop="locCode"/>
-                     <el-table-column label="盘点类型" align="center" prop="userDefined3" />
+                     <el-table-column label="盘点类型" align="center" prop="userDefined3" :formatter="formatOrderStatusTWO"/>
                     <el-table-column label="审核意见" align="center" prop="userDefined4" />
                  <el-table-column label="盘点人" align="center" prop="userDefined2"/>
                     <el-table-column label="盘点时间" align="center" prop="userDefined5"/>
@@ -176,26 +177,7 @@
                     <el-table-column label="可用标识" align="center" prop="Active"v-if="false" />
                     <el-table-column label="企业主键" align="center" prop="enterpriseId"v-if="false" />
                     <el-table-column label="企业编码" align="center" prop="enterpriseCode"v-if="false" />
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+
-                <template slot-scope="scope">
-                    <el-button
-                            size="mini"
-                            type="text"
-                            icon="el-icon-edit"
-                            @click="handleUpdate(scope.row)"
-                            v-hasPermi="['systemFinished:systemFinished:edit']"
-                    >修改
-                    </el-button>
-                    <el-button
-                            size="mini"
-                            type="text"
-                            icon="el-icon-delete"
-                            @click="handleDeleteRW(scope.row)"
-                            v-hasPermi="['systemFinished:systemFinished:remove']"
-                    >删除
-                    </el-button>
-                </template>
-            </el-table-column>
         </el-table>
 
         <pagination
@@ -484,6 +466,31 @@
                     this.loading = false;
                 });
             },
+          formatOrderStatus(row) {
+            switch(row.orderStatus) {
+              case "0":
+                return '待盘点';
+              case "1":
+                return '待调整';
+              case "2":
+                return '驳回';
+              case "3":
+                return '已完成';
+              default:
+                return '';
+            }
+          },
+
+          formatOrderStatusTWO(row) {
+            switch(row.userDefined3) {
+              case "0":
+                return '明盘';
+              case "1":
+                return '盲盘';
+              default:
+                return '';
+            }
+          },
             // 取消按钮
             cancel() {
                 this.open = false;
@@ -494,7 +501,7 @@
             reset() {
                 this.form = {
                         siteCode: null,
-                        ID: null,
+                  id: null,
                         orderCode: null,
                         materialCode: null,
                         materialDesc: null,
@@ -582,7 +589,7 @@
           },
           // 多选框选中数据
             handleSelectionChange(selection) {
-                this.ids = selection.map(item => item.ID)
+                this.ids = selection.map(item => item.id)
                 this.single = selection.length !== 1
                 this.multiple = !selection.length
             },
@@ -616,9 +623,9 @@
             /** 修改按钮操作 */
             handleUpdate(row) {
                 this.reset();
-                const ID =
+                const id =
-                row.ID || this.ids
+                row.id || this.ids
-                getSystemFinished(ID).then(response => {
+                getSystemFinished(id).then(response => {
                     this.form = response.data;
                     this.open = true;
                     this.title = "修改成品盘点单";