定量界面相关调整

src/views/system/ration/InvRationSet.vue

@@ -124,25 +124,35 @@
 
         <el-table-column type="selection" :reserve-selection="true"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="仓库" prop="invName" v-if="showSup"
+        <el-table-column label="仓库" prop="invName"
-                         show-overflow-tooltip width="120"></el-table-column>
+                         show-overflow-tooltip width="100"></el-table-column>
-        <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip width="120"></el-table-column>
+        <el-table-column label="供应商" prop="supName" show-overflow-tooltip width="180"></el-table-column>
-        <el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
+        <el-table-column label="DI/物资编码" prop="nameCode" width="140"></el-table-column>
         <el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
-        <el-table-column label="在库数量" prop="invCount" width="120">
+        <el-table-column label="在库数量" prop="invCount" width="90"></el-table-column>
+        <el-table-column label="定额数量" prop="rationCount" width="90"></el-table-column>
+        <el-table-column label="剩余数量" width="90">
+          <template slot-scope="scope">
+
+            <span :style="{ color: scope.row.invCount - scope.row.rationCount<0 ? 'red' : 'blue' }">{{
+                scope.row.invCount - scope.row.rationCount
+              }}</span>
+          </template>
         </el-table-column>
-        <el-table-column label="定额数量" prop="rationCount" width="120"></el-table-column>
+        <el-table-column label="业务单据" prop="busType" width="120">
-        <el-table-column label="剩余数量" width="120">
           <template slot-scope="scope">
-            <span>{{ scope.row.invCount - scope.row.rationCount }}</span>
+            <span>{{ busMap[scope.row.busType] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="计量单位" prop="measname" width="120"></el-table-column>
+        <el-table-column label="出入库单据" prop="scanTypeName" width="120">
+        </el-table-column>
+
+        <el-table-column label="计量单位" prop="measname" width="90"></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip
-                         width="120"></el-table-column>
+                         width="180"></el-table-column>
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作" width="180" fixed="right">
+        <el-table-column label="操作" width="100" fixed="right">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -151,13 +161,13 @@
             >编辑
             </el-button
             >
-            <el-button
+            <!--            <el-button-->
-              type="text"
+            <!--              type="text"-->
-              size="small"
+            <!--              size="small"-->
-              @click.native.stop="detailDialog(scope.row)"
+            <!--              @click.native.stop="detailDialog(scope.row)"-->
-            >详情
+            <!--            >详情-->
-            </el-button
+            <!--            </el-button-->
-            >
+            <!--            >-->
             <el-button
               type="text"
               size="small"
@@ -277,6 +287,13 @@ export default {
       addInvRemindSetDialogVisible: false,
       invId: null,
       spaceList: [],
+      busMap: {
+        'HCLY': '耗材领用',
+        'CPSG': '产品申购',
+        'CGJH': '采购计划',
+        'CGDD': '采购订单',
+      },
+
     };
   },
   methods: {
@@ -384,6 +401,11 @@ export default {
     },
 
     buildOrder() {
+      this.$confirm("此操作根据定额数量缺量生成单据，是否继续？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
         if (this.mutlselecteds.length > 0) {
           let query = {
             rationEntities: this.mutlselecteds
@@ -404,6 +426,10 @@ export default {
           this.$message.warning("请选择要生成单据产品");
         }
 
+      }).catch(() => {
+      });
+
+
     },