修改bug

src/api/basicData/agreement.js

@@ -63,7 +63,7 @@ export function getStoragetree() {
 }
 export function getAllgoodstype() {
   return request({
-    url: '/api/blade-client/goodstype/listAll',
+    url: '/api/blade-client/goodsdesc/descListAll',
     method: 'get',
   })
 }

src/views/InventoryManagement/inventory/config/customerContact.json

@@ -60,34 +60,6 @@
       "width": 100
     },
     {
-      "index": 6,
-      "prop": "length",
-      "label": "长度(mm)",
-      "overHidden": true,
-      "width": 100
-    },
-    {
-      "index": 7,
-      "prop": "width",
-      "label": "宽度(mm)",
-      "overHidden": true,
-      "width": 100
-    },
-    {
-      "index": 8,
-      "prop": "thickness",
-      "label": "厚度(mm)",
-      "overHidden": true,
-      "width": 100
-    },
-    {
-      "index": 9,
-      "prop": "widthItem",
-      "label": "宽度明细(mm)",
-      "overHidden": true,
-      "width": 100
-    },
-    {
       "index": 10,
       "prop": "billNo",
       "label": "捆包号",
@@ -111,8 +83,8 @@
     },
     {
       "index": 13,
-      "prop": "balanceNumber",
-      "label": "结余量",
+      "prop": "storageInQuantity",
+      "label": "入库量",
       "overHidden": true,
       "width": 100
     },
@@ -131,7 +103,32 @@
       "width": 100
     },
     {
-      "index":  16,
+      "index": 16,
+      "prop": "isIssue",
+      "label": "库存状态",
+      "overHidden": true,
+      "dicData": [
+        {
+          "label": "录入",
+          "value": "0"
+        },
+        {
+          "label": "在库",
+          "value": "1"
+        },
+        {
+          "label": "出库中",
+          "value": "2"
+        },
+        {
+          "label": "已出库",
+          "value": "3"
+        }
+      ],
+      "width": 100
+    },
+    {
+      "index":  17,
       "prop": "remarks",
       "label": "备注",
       "overHidden": true,

src/views/InventoryManagement/inventory/config/mainList2.json

@@ -8,6 +8,7 @@
   "delBtn": false,
   "addBtn": false,
   "headerAlign": "center",
+  "header":false,
   "menuWidth": "170",
   "menu":false,
   "showSummary": true,

src/views/InventoryManagement/inventory/detailsPage.vue

@@ -190,19 +190,24 @@ export default {
       this.findObject(this.option.column, "businessType").dicData =
         res.data.data;
     });
-    getAllgoods().then(res => {
-      this.findObject(this.tableOption.column, "itemId").dicData =
-        res.data.data;
-    })
+    this.getAllWorkDicts()
   },
   methods: {
+    getAllWorkDicts() {
+      getAllgoods().then(res => {
+        this.findObject(this.tableOption.column, "itemId").dicData =
+          res.data.data;
+      })
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
     calculateChange(row) {
-      row.balanceNumber = Number(row.inventory ? row.inventory : 0)
-      row.surplusLoss = Number(row.inventory ? row.inventory : 0)-Number(row.balanceNumber ? row.balanceNumber : 0)
-      row.balanceMoney=Number(row.price?row.price:0)*Number(row.row.balanceNumber)
+      // console.log(row)
+      row.surplusLoss = Number(row.inventory ? row.inventory : 0) - Number(row.storageInQuantity ? row.storageInQuantity : 0)
+      // row.balanceNumber = Number(row.inventory ? row.inventory : 0)
+      // row.surplusLoss = Number(row.inventory ? row.inventory : 0) - Number(row.balanceNumber ? row.balanceNumber : 0)
+      // row.balanceMoney = Number(row.price ? row.price : 0) * Number(row.row.balanceNumber)
     },
     getStorage() {
       getStorage({ storageTypeId: this.form.storageId }).then(res => {
@@ -299,6 +304,7 @@ export default {
           delete res.data.data.status
           res.data.data.stockTime = getCurrentDate()
           res.data.data.itemsVOList.forEach(e => {
+            e.surplusLoss = Number(e.inventory ? e.inventory : 0) - Number(e.storageInQuantity ? e.storageInQuantity : 0)
             delete e.id
           })
           this.form = res.data.data;
@@ -401,6 +407,8 @@ export default {
         this.$nextTick(() => {
           this.$refs.crud.doLayout();
         });
+        this.getAllWorkDicts()
+        this.getStorage()
         this.$message.success("重置成功");
         //关闭窗口
         setTimeout(() => {
@@ -426,4 +434,12 @@ export default {
 ::v-deep .select-component {
   display: flex !important;
 }
+
+::v-deep .el-table .cell {
+  padding: 0 2px !important;
+}
+
+::v-deep .avue-crud .el-table .el-form-item__label {
+  left: -1px;
+}
 </style>

src/views/InventoryManagement/inventory/index.vue

@@ -51,10 +51,10 @@
                         </span>
                     </template>
                     <template slot="stockTimeSearch">
-                    <el-date-picker v-model="search2.stockTime" type="daterange" start-placeholder="开始日期"
-                        end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
-                    </el-date-picker>
-                </template>
+                        <el-date-picker v-model="search2.stockTime" type="daterange" start-placeholder="开始日期"
+                            end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+                        </el-date-picker>
+                    </template>
                 </avue-crud>
             </span>
             <span slot="footer" class="dialog-footer">
@@ -110,18 +110,7 @@ export default {
         this.option = await this.getColumnData(this.getColumnName(196), option);
         this.option.height = window.innerHeight - 210;
         this.itemOption.height = window.innerHeight - 410;
-        this.getWorkDicts("approval_status").then(res => {
-            this.findObject(this.option.column, "status").dicData =
-                res.data.data;
-        });
-        this.getWorkDicts("CMY_business_type").then(res => {
-            this.findObject(this.option.column, "businessType").dicData =
-                res.data.data;
-        });
-        getStoragetree().then(res => {
-            this.findObject(this.option.column, "storageId").dicData =
-                res.data.data;
-        })
+
         this.getWorkDicts("approval_status").then(res => {
             this.findObject(this.itemOption.column, "status").dicData =
                 res.data.data;
@@ -134,16 +123,31 @@ export default {
             this.findObject(this.itemOption.column, "storageId").dicData =
                 res.data.data;
         })
+        this.getAllWorkDicts()
     },
     activated() {
         setTimeout(() => {
             if (this.$route.query.check && this.show) {
-                this.editOpen({id:this.$route.query.check.srcBillId},1)
+                this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
                 this.show = false;
             }
         }, 100);
     },
     methods: {
+        getAllWorkDicts() {
+            this.getWorkDicts("approval_status").then(res => {
+                this.findObject(this.option.column, "status").dicData =
+                    res.data.data;
+            });
+            this.getWorkDicts("CMY_business_type").then(res => {
+                this.findObject(this.option.column, "businessType").dicData =
+                    res.data.data;
+            });
+            getStoragetree().then(res => {
+                this.findObject(this.option.column, "storageId").dicData =
+                    res.data.data;
+            })
+        },
         searchCriteriaSwitch(type) {
             if (type) {
                 this.option.height = this.option.height - 191;
@@ -231,8 +235,8 @@ export default {
             if (this.search.stockTime && this.search.stockTime.length > 0) {
                 params = {
                     ...params,
-                    createStartTime: this.search.stockTime[0]+' '+"00:00:00",
-                    createEndTime: this.search.stockTime[1]+' '+"23:59:59"
+                    createStartTime: this.search.stockTime[0] + ' ' + "00:00:00",
+                    createEndTime: this.search.stockTime[1] + ' ' + "23:59:59"
                 };
             }
             let data = this.deepClone(Object.assign({}, params, this.search));
@@ -313,6 +317,7 @@ export default {
                 this.$nextTick(() => {
                     this.$refs.crud.doLayout();
                 });
+                this.getAllWorkDicts()
                 this.$message.success("重置成功");
                 this.$refs.crud.$refs.dialogColumn.columnBox = false;
             }

src/views/basicData/agreement/detailsPage.vue

@@ -234,10 +234,6 @@ export default {
       this.findObject(this.option.column, "billType").dicData =
         res.data.data;
     });
-    this.getWorkDicts("unit").then(res => {
-      this.findObject(this.optionList.column, "feeUnitId").dicData =
-        res.data.data;
-    });
     this.getWorkDicts("bill_status").then(res => {
       this.findObject(this.option.column, "billSdtatus").dicData = res.data.data;
     });
@@ -252,8 +248,15 @@ export default {
       this.findObject(this.option.column, "deptId").dicData =
         res.data.data;
     })
+    this.getAllWorkDicts()
   },
   methods: {
+    getAllWorkDicts() {
+      this.getWorkDicts("unit").then(res => {
+      this.findObject(this.optionList.column, "feeUnitId").dicData =
+        res.data.data;
+    });
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -390,6 +393,7 @@ export default {
         this.$nextTick(() => {
           this.$refs.crud.doLayout();
         });
+        this.getAllWorkDicts()
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
@@ -423,4 +427,10 @@ export default {
   height: 150px;
   line-height: 150px;
 }
+::v-deep .el-table .cell {
+    padding: 0 2px !important;
+}
+::v-deep .avue-crud .el-table .el-form-item__label {
+    left: -1px;
+}
 </style>

src/views/financing/financingManagement/index.vue

@@ -64,25 +64,28 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(198), option);
-    this.getWorkDicts("approval_status").then(res => {
-      this.findObject(this.option.column, "status").dicData =
-        res.data.data;
-    });
-    this.getWorkDicts("financing_type").then(res => {
-      this.findObject(this.option.column, "financingType").dicData =
-        res.data.data;
-    });
     this.option.height = window.innerHeight - 210;
+    this.getAllWorkDicts()
   },
   activated() {
-        setTimeout(() => {
-          if (this.$route.query.check && this.show) {
-                this.editOpen({id:this.$route.query.check.srcBillId},1)
-                this.show = false;
-            }
-        }, 100);
-    },
+    setTimeout(() => {
+      if (this.$route.query.check && this.show) {
+        this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
+        this.show = false;
+      }
+    }, 100);
+  },
   methods: {
+    getAllWorkDicts() {
+      this.getWorkDicts("approval_status").then(res => {
+        this.findObject(this.option.column, "status").dicData =
+          res.data.data;
+      });
+      this.getWorkDicts("financing_type").then(res => {
+        this.findObject(this.option.column, "financingType").dicData =
+          res.data.data;
+      });
+    },
     searchCriteriaSwitch(type) {
       if (type) {
         this.option.height = this.option.height - 46;
@@ -182,6 +185,7 @@ export default {
         this.$nextTick(() => {
           this.$refs.crud.doLayout();
         });
+        this.getAllWorkDicts()
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }

src/views/purchasingManagement/inStock/config/customerContact.json

@@ -57,7 +57,7 @@
     {
       "index": 2,
       "prop": "storageId",
-      "label": "库区",
+      "label": "*库区",
       "overHidden": true,
       "type": "select",
       "props": {
@@ -70,7 +70,7 @@
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请选择",
           "trigger": "blur"
         }
       ],
@@ -79,7 +79,7 @@
     {
       "index": 3,
       "prop": "itemId",
-      "label": "品名",
+      "label": "*品名",
       "type": "select",
       "props": {
         "label": "cname",
@@ -92,7 +92,7 @@
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请选择",
           "trigger": "blur"
         }
       ],
@@ -101,13 +101,13 @@
     {
       "index": 4,
       "prop": "itemType",
-      "label": "品牌",
+      "label": "*品牌",
       "overHidden": true,
       "cell": true,
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请输入",
           "trigger": "blur"
         }
       ],
@@ -116,13 +116,13 @@
     {
       "index": 5,
       "prop": "grade",
-      "label": "等级",
+      "label": "*等级",
       "overHidden": true,
       "cell": true,
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请输入",
           "trigger": "blur"
         }
       ],
@@ -147,13 +147,13 @@
     {
       "index": 10,
       "prop": "billNo",
-      "label": "捆包号",
+      "label": "*捆包号",
       "overHidden": true,
       "cell": true,
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请输入",
           "trigger": "blur"
         }
       ],
@@ -162,7 +162,7 @@
     {
       "index": 11,
       "prop": "sliceNumber",
-      "label": "片数",
+      "label": "*片数",
       "overHidden": true,
       "cell": true,
       "type": "number",
@@ -171,7 +171,7 @@
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请输入",
           "trigger": "blur"
         }
       ],
@@ -180,13 +180,13 @@
     {
       "index": 12,
       "prop": "storageInQuantity",
-      "label": "入库量",
+      "label": "*入库量",
       "overHidden": true,
       "cell": true,
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请输入",
           "trigger": "blur"
         }
       ],
@@ -195,7 +195,7 @@
     {
       "index": 13,
       "prop": "unit",
-      "label": "入库单位",
+      "label": "*入库单位",
       "overHidden": true,
       "type": "select",
       "props": {
@@ -207,7 +207,7 @@
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请选择",
           "trigger": "blur"
         }
       ],
@@ -216,13 +216,13 @@
     {
       "index": 14,
       "prop": "price",
-      "label": "入库单价",
+      "label": "*入库单价",
       "overHidden": true,
       "cell": true,
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请输入",
           "trigger": "blur"
         }
       ],
@@ -281,8 +281,8 @@
     },
     {
       "index": 22,
-      "prop": "balanceMoney",
-      "label": "结余金额",
+      "prop": "surplusLoss",
+      "label": "盈亏量",
       "overHidden": true,
       "width": 100
     },
@@ -293,15 +293,15 @@
       "overHidden": true,
       "dicData": [
         {
-          "label": "待入库",
+          "label": "录入",
           "value": "0"
         },
         {
-          "label": "已入库",
+          "label": "在库",
           "value": "1"
         },
         {
-          "label": "待出库",
+          "label": "出库中",
           "value": "2"
         },
         {

src/views/purchasingManagement/inStock/detailsPage.vue

@@ -7,6 +7,8 @@
         </el-button>
       </div>
       <div class="add-customer-btn">
+        <el-button type="info" @click="getData" size="small">刷新资料
+        </el-button>
         <el-button type="primary" size="small" :disabled="form.status>0" v-if="detailData.status == 1"
           class="el-button--small-yh " @click.stop="openEdit">编辑
         </el-button>
@@ -29,11 +31,11 @@
       <trade-card title="基础信息">
         <avue-form ref="form" class="trading-form" v-model="form" :option="option">
           <template slot="purchaserId">
-            <crop-select v-model="form.purchaserId" corpType="KH" :refresh="false" @getCorpData="getKHData"
+            <crop-select v-model="form.purchaserId" corpType="KH" @getCorpData="getKHData"
               :disabled="detailData.status == 1"></crop-select>
           </template>
           <template slot="corpId">
-            <crop-select v-model="form.corpId" corpType="GYS" :refresh="false" @getCorpData="getGYSData"
+            <crop-select v-model="form.corpId" corpType="GYS" @getCorpData="getGYSData"
               :disabled="detailData.status == 1"></crop-select>
           </template>
           <template slot="storageId">
@@ -42,6 +44,15 @@
               clearable @change="storagetreeChange">
             </el-cascader>
           </template>
+          <template slot-scope="{column}" slot="purchaserIdLabel">
+            <span style="color: #409EFF;cursor: pointer" @click.stop="addData(column.prop)">{{column.label}}</span>
+          </template>
+          <template slot-scope="{column}" slot="corpIdLabel">
+            <span style="color: #409EFF;cursor: pointer" @click.stop="addData(column.prop)">{{column.label}}</span>
+          </template>
+          <template slot-scope="{column}" slot="storageIdLabel">
+            <span style="color: #409EFF;cursor: pointer" @click.stop="addData('storage')">{{column.label}}</span>
+          </template>
         </avue-form>
       </trade-card>
       <trade-card title="入库明细">
@@ -60,6 +71,12 @@
             <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addRow"
               :disabled="detailData.status == 1" circle></el-button>
           </template>
+          <template slot="storageIdHeader" slot-scope="{column}">
+            <span style="color: #409EFF;cursor: pointer" @click.stop="addData(column.prop)">{{column.label}}</span>
+          </template>
+          <template slot="itemIdHeader" slot-scope="{column}">
+            <span style="color: #409EFF;cursor: pointer" @click.stop="addData(column.prop)">{{column.label}}</span>
+          </template>
           <template slot="oneCode" slot-scope="{ row, index }">
             <el-popover placement="right" width="160" trigger="click">
               <el-image style="width: 160px; height: 80px" :src="row.oneCode" :fit="fit"></el-image>
@@ -91,12 +108,12 @@
                 打印</el-button>
               <div style="display:flex;flex-direction: column;justify-content: center;margin-left: 10px;">
                 <el-tooltip effect="dark" content="向上移动" placement="top">
-                  <i v-if="index != 0&&detailData.status != 1" :disabled="disabled || detailData.status == 1" class="el-icon-arrow-up"
-                    @click="moveUp(row, index)" style="color:#409EFF;"></i>
+                  <i v-if="index != 0&&detailData.status != 1" :disabled="disabled || detailData.status == 1"
+                    class="el-icon-arrow-up" @click="moveUp(row, index)" style="color:#409EFF;"></i>
                 </el-tooltip>
-                <el-tooltip effect="dark" content="向下移动" placement="bottom"> <i v-if="index != (itemsVOList.length - 1)&&detailData.status != 1"
-                     class="el-icon-arrow-down" @click="moveDown(row, index)"
-                    style="color:#409EFF;"></i></el-tooltip>
+                <el-tooltip effect="dark" content="向下移动" placement="bottom"> <i
+                    v-if="index != (itemsVOList.length - 1)&&detailData.status != 1" class="el-icon-arrow-down"
+                    @click="moveDown(row, index)" style="color:#409EFF;"></i></el-tooltip>
               </div>
             </div>
 
@@ -109,8 +126,8 @@
       <!-- <upload-file ref="uploadFile" title="合同附件" :disabled="detailData.status == 1" :orderFilesList="orderFilesList"
         delUrl="" /> -->
       <containerTitle title="上传附件"></containerTitle>
-      <c-upload typeUpload="CD" deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId" :data="orderFilesList" display
-        :enumerationValue="85.6" :disabled="detailData.status == 1"></c-upload>
+      <c-upload typeUpload="CD" deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId"
+        :data="orderFilesList" display :enumerationValue="85.6" :disabled="detailData.status == 1"></c-upload>
 
       <el-dialog append-to-body title="审核进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
         :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
@@ -319,16 +336,29 @@ export default {
       this.findObject(this.option.column, "businessType").dicData =
         res.data.data;
     });
-    getAllgoods().then(res => {
-      this.findObject(this.tableOption.column, "itemId").dicData =
-        res.data.data;
-    })
-    this.getWorkDicts("unit").then(res => {
-      this.findObject(this.tableOption.column, "unit").dicData =
-        res.data.data;
-    });
+    this.getAllWorkDicts()
   },
   methods: {
+    getData() {
+      getAllgoods().then(res => {
+        this.findObject(this.tableOption.column, "itemId").dicData =
+          res.data.data;
+      })
+      getStoragetree().then(res => {
+        this.storagetreeList = res.data.data;
+      })
+      this.getStorage()
+    },
+    getAllWorkDicts() {
+      getAllgoods().then(res => {
+        this.findObject(this.tableOption.column, "itemId").dicData =
+          res.data.data;
+      })
+      this.getWorkDicts("unit").then(res => {
+        this.findObject(this.tableOption.column, "unit").dicData =
+          res.data.data;
+      });
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -566,6 +596,20 @@ export default {
         loading()
       }
     },
+    addData(row) {
+      console.log(row)
+      if (row == 'purchaserId') {
+        this.$router.push(`/basicData/customerInformation/index`);
+      } else if (row == 'corpId') {
+        this.$router.push(`/basicData/customerManagement/supplierMaterial/index`);
+      } else if (row == 'storage') {
+        this.$router.push(`/basicData/basicStorageType/index`);
+      } else if (row == 'storageId') {
+        this.$router.push(`/basicData/basicStorageDesc/index`);
+      } else if (row == 'itemId') {
+        this.$router.push(`/basicData/commodityType/index`);
+      }
+    },
     //返回列表
     backToList() {
       let orderFeesList = this.$refs.feeInfo.submitData();
@@ -626,10 +670,13 @@ export default {
           this.$refs.crud.doLayout();
         });
         this.$message.success("重置成功");
+        this.getAllWorkDicts()
+        this.getStorage()
         //关闭窗口
         setTimeout(() => {
           this.$refs.crud.$refs.dialogColumn.columnBox = false;
         }, 1000);
+
       }
     }
   },
@@ -650,4 +697,12 @@ export default {
 ::v-deep .select-component {
   display: flex !important;
 }
+
+::v-deep .el-table .cell {
+  padding: 0 2px !important;
+}
+
+::v-deep .avue-crud .el-table .el-form-item__label {
+  left: -1px;
+}
 </style>

src/views/purchasingManagement/inStock/index.vue

@@ -73,28 +73,31 @@ export default {
     async created() {
         this.option = await this.getColumnData(this.getColumnName(188), option);
         this.option.height = window.innerHeight - 210;
-        this.getWorkDicts("approval_status").then(res => {
-            this.findObject(this.option.column, "status").dicData =
-                res.data.data;
-        });
-        this.getWorkDicts("CMY_business_type").then(res => {
-            this.findObject(this.option.column, "businessType").dicData =
-                res.data.data;
-        });
-        getStoragetree().then(res => {
-            this.findObject(this.option.column, "storageId").dicData =
-                res.data.data;
-        })
+        this.getAllWorkDicts()
     },
     activated() {
         setTimeout(() => {
             if (this.$route.query.check && this.show) {
-                this.editOpen({id:this.$route.query.check.srcBillId},1)
+                this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
                 this.show = false;
             }
         }, 100);
     },
     methods: {
+        getAllWorkDicts() {
+            this.getWorkDicts("approval_status").then(res => {
+                this.findObject(this.option.column, "status").dicData =
+                    res.data.data;
+            });
+            this.getWorkDicts("CMY_business_type").then(res => {
+                this.findObject(this.option.column, "businessType").dicData =
+                    res.data.data;
+            });
+            getStoragetree().then(res => {
+                this.findObject(this.option.column, "storageId").dicData =
+                    res.data.data;
+            })
+        },
         searchCriteriaSwitch(type) {
             if (type) {
                 this.option.height = this.option.height - 191;
@@ -151,8 +154,8 @@ export default {
             if (this.search.stockTime && this.search.stockTime.length > 0) {
                 params = {
                     ...params,
-                    createStartTime: this.search.stockTime[0]+' '+"00:00:00",
-                    createEndTime: this.search.stockTime[1]+' '+"23:59:59"
+                    createStartTime: this.search.stockTime[0] + ' ' + "00:00:00",
+                    createEndTime: this.search.stockTime[1] + ' ' + "23:59:59"
                 };
             }
             let data = this.deepClone(Object.assign({}, params, this.search));
@@ -214,6 +217,7 @@ export default {
                 this.$nextTick(() => {
                     this.$refs.crud.doLayout();
                 });
+                this.getAllWorkDicts()
                 this.$message.success("重置成功");
                 this.$refs.crud.$refs.dialogColumn.columnBox = false;
             }

src/views/salesManagement/outStock/config/customerContact.json

@@ -60,7 +60,7 @@
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请选择",
           "trigger": "blur"
         }
       ],
@@ -82,7 +82,7 @@
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请选择",
           "trigger": "blur"
         }
       ],
@@ -97,7 +97,7 @@
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请输入",
           "trigger": "blur"
         }
       ],
@@ -112,7 +112,7 @@
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请输入",
           "trigger": "blur"
         }
       ],
@@ -143,7 +143,7 @@
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请输入",
           "trigger": "blur"
         }
       ],
@@ -161,7 +161,7 @@
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请输入",
           "trigger": "blur"
         }
       ],
@@ -175,7 +175,7 @@
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请输入",
           "trigger": "blur"
         }
       ],
@@ -196,7 +196,7 @@
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请选择",
           "trigger": "blur"
         }
       ],
@@ -212,7 +212,7 @@
       "rules": [
         {
           "required": true,
-          "message": "",
+          "message": "请输入",
           "trigger": "blur"
         }
       ],
@@ -235,21 +235,28 @@
       "width": 100
     },
     {
+      "index": 17,
+      "prop": "surplusLoss",
+      "label": "盈亏量",
+      "overHidden": true,
+      "width": 100
+    },
+    {
       "index": 23,
       "prop": "isIssue",
       "label": "库存状态",
       "overHidden": true,
       "dicData": [
         {
-          "label": "待入库",
+          "label": "录入",
           "value": "0"
         },
         {
-          "label": "已入库",
+          "label": "在库",
           "value": "1"
         },
         {
-          "label": "待出库",
+          "label": "出库中",
           "value": "2"
         },
         {

src/views/salesManagement/outStock/detailsPage.vue

@@ -92,12 +92,12 @@
                 打印</el-button> -->
               <div style="display:flex;flex-direction: column;justify-content: center;margin-left: 10px;">
                 <el-tooltip effect="dark" content="向上移动" placement="top">
-                  <i v-if="index != 0&&detailData.status != 1" :disabled="detailData.status == 1" class="el-icon-arrow-up"
-                    @click="moveUp(row, index)" style="color:#409EFF;"></i>
+                  <i v-if="index != 0&&detailData.status != 1" :disabled="detailData.status == 1"
+                    class="el-icon-arrow-up" @click="moveUp(row, index)" style="color:#409EFF;"></i>
                 </el-tooltip>
-                <el-tooltip effect="dark" content="向下移动" placement="bottom"> <i v-if="index != (itemsVOList.length - 1)&&detailData.status != 1"
-                    :disabled="detailData.status == 1" class="el-icon-arrow-down" @click="moveDown(row, index)"
-                    style="color:#409EFF;"></i></el-tooltip>
+                <el-tooltip effect="dark" content="向下移动" placement="bottom"> <i
+                    v-if="index != (itemsVOList.length - 1)&&detailData.status != 1" :disabled="detailData.status == 1"
+                    class="el-icon-arrow-down" @click="moveDown(row, index)" style="color:#409EFF;"></i></el-tooltip>
               </div>
             </div>
           </template>
@@ -109,8 +109,8 @@
       <!-- <upload-file ref="uploadFile" title="合同附件" :disabled="detailData.status == 1" :orderFilesList="orderFilesList"
         delUrl="" /> -->
       <containerTitle title="上传附件"></containerTitle>
-      <c-upload typeUpload="CD" deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId" :data="orderFilesList" display
-        :enumerationValue="85.6" :disabled="detailData.status == 1"></c-upload>
+      <c-upload typeUpload="CD" deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId"
+        :data="orderFilesList" display :enumerationValue="85.6" :disabled="detailData.status == 1"></c-upload>
 
       <el-dialog append-to-body title="审核进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
         :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
@@ -281,19 +281,22 @@ export default {
       this.findObject(this.option.column, "businessType").dicData =
         res.data.data;
     });
-    getAllgoods().then(res => {
-      this.findObject(this.tableOption.column, "itemId").dicData =
-        res.data.data;
-    })
-    this.getWorkDicts("unit").then(res => {
-      this.findObject(this.tableOption.column, "unit").dicData =
-        res.data.data;
-    });
     if (this.$route.query.generateId) {
       this.getGenerate(this.$route.query.generateId);
     }
+    this.getAllWorkDicts()
   },
   methods: {
+    getAllWorkDicts() {
+      getAllgoods().then(res => {
+        this.findObject(this.tableOption.column, "itemId").dicData =
+          res.data.data;
+      })
+      this.getWorkDicts("unit").then(res => {
+        this.findObject(this.tableOption.column, "unit").dicData =
+          res.data.data;
+      });
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -645,6 +648,8 @@ export default {
         this.$nextTick(() => {
           this.$refs.crud.doLayout();
         });
+        this.getAllWorkDicts()
+        this.getStorage()
         this.$message.success("重置成功");
         //关闭窗口
         setTimeout(() => {
@@ -670,4 +675,10 @@ export default {
 ::v-deep .select-component {
   display: flex !important;
 }
+::v-deep .el-table .cell {
+    padding: 0 2px !important;
+}
+::v-deep .avue-crud .el-table .el-form-item__label {
+    left: -1px;
+}
 </style>

src/views/salesManagement/outStock/index.vue

@@ -65,18 +65,7 @@ export default {
     async created() {
         this.option = await this.getColumnData(this.getColumnName(190), option);
         this.option.height = window.innerHeight - 210;
-        this.getWorkDicts("approval_status").then(res => {
-            this.findObject(this.option.column, "status").dicData =
-                res.data.data;
-        });
-        this.getWorkDicts("CMY_business_type").then(res => {
-            this.findObject(this.option.column, "businessType").dicData =
-                res.data.data;
-        });
-        getStoragetree().then(res => {
-            this.findObject(this.option.column, "storageId").dicData =
-                res.data.data;
-        })
+        this.getAllWorkDicts()
     },
     activated() {
         setTimeout(() => {
@@ -85,12 +74,26 @@ export default {
                 this.show = false;
             }
             if (this.$route.query.check && this.show) {
-                this.editOpen({id:this.$route.query.check.srcBillId},1)
+                this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
                 this.show = false;
             }
         }, 100);
     },
     methods: {
+        getAllWorkDicts() {
+            this.getWorkDicts("approval_status").then(res => {
+                this.findObject(this.option.column, "status").dicData =
+                    res.data.data;
+            });
+            this.getWorkDicts("CMY_business_type").then(res => {
+                this.findObject(this.option.column, "businessType").dicData =
+                    res.data.data;
+            });
+            getStoragetree().then(res => {
+                this.findObject(this.option.column, "storageId").dicData =
+                    res.data.data;
+            })
+        },
         searchCriteriaSwitch(type) {
             if (type) {
                 this.option.height = this.option.height - 191;
@@ -147,8 +150,8 @@ export default {
             if (this.search.stockTime && this.search.stockTime.length > 0) {
                 params = {
                     ...params,
-                    createStartTime: this.search.stockTime[0]+' '+"00:00:00",
-                    createEndTime: this.search.stockTime[1]+' '+"23:59:59"
+                    createStartTime: this.search.stockTime[0] + ' ' + "00:00:00",
+                    createEndTime: this.search.stockTime[1] + ' ' + "23:59:59"
                 };
             }
             let data = this.deepClone(Object.assign({}, params, this.search));
@@ -202,6 +205,7 @@ export default {
                 this.$nextTick(() => {
                     this.$refs.crud.doLayout();
                 });
+                this.getAllWorkDicts()
                 this.$message.success("重置成功");
                 this.$refs.crud.$refs.dialogColumn.columnBox = false;
             }