修改轮胎

src/views/tirePartsMall/inventory/index.vue

@@ -49,7 +49,10 @@
                   </div>
                 </template>
                 <template slot-scope="{ row }" slot="storageName">
-                  <span style="color: #409EFF;cursor: pointer" @click.stop="inPage(row)">
+                  <span v-if="reservoirArea==1" style="color: #409EFF;cursor: pointer" @click.stop="inPage(row)">
+                    {{ row.storageName }}
+                  </span>
+                   <span v-else>
                     {{ row.storageName }}
                   </span>
                 </template>
@@ -498,7 +501,8 @@ export default {
         ]
       },
       brandList: [],
-      brandSearch: {}
+      brandSearch: {},
+      reservoirArea:0,
     };
   },
   async created() {
@@ -510,6 +514,9 @@ export default {
         this.findObject(this.option.column, "brandItem").label = "规格型号1";
       }
     });
+       isProcurement({ param: "reservoir.area" }).then(res => {
+      this.reservoirArea = res.data.data;
+    });
     this.key++;
     let i = 0;
     this.option.column.forEach(item => {

src/views/tirePartsMall/purchaseService/returns/detailsPage.vue

@@ -130,7 +130,7 @@
                 {{ row.goodsName }}
               </template>
               <template slot="sendNum" slot-scope="{ row }">
-               <el-popover v-if="reservoirArea" width="600" trigger="click">
+               <el-popover v-if="reservoirArea==1" width="600" trigger="click">
                   <avue-crud :data="areaData" :option="areaOption"></avue-crud>
                   <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewArea(row)">{{ row.sendNum }}</span>
                 </el-popover>

src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/components/viewArea.vue

@@ -33,14 +33,12 @@
             placeholder="库区"
             label="cname"
             res="records"
-            :url="'/blade-sales-part/reservoirarea/listZero?current=1&size=5&storageId=' + form.storageId"
+            :url="'/blade-sales-part/reservoirarea/list?current=1&size=5&storageId=' + form.storageId"
             :filterable="true"
             :remote="true"
             dataName="cname"
             :disabled="disabled"
             @selectChange="rowDicChange('reservoirAreaName', $event, row)"
-            :slotRight="true"
-            rightLabel="balanceQuantity"
           ></dic-select>
         </template>
         <template slot="quantity" slot-scope="{ row }">
@@ -97,11 +95,6 @@ export default {
             overHidden: true
           },
           {
-            label: "库存",
-            prop: "balanceQuantity",
-            overHidden: true
-          },
-          {
             label: "本次数量",
             prop: "quantity",
             overHidden: true
@@ -134,7 +127,7 @@ export default {
       });
     },
     addRow() {
-      if (!this.query.dot) {
+      if (!this.query.dot&&this.query.whether == 1) {
         return this.$message.error("请选择批次号!");
       }
       this.data.push({
@@ -145,11 +138,9 @@ export default {
       if (name == "reservoirAreaName") {
         if (row) {
           el.reservoirAreaId = row.id;
-          el.balanceQuantity = row.balanceQuantity;
         } else {
           el.reservoirAreaId = null;
           el.reservoirAreaName = null;
-          el.balanceQuantity = null;
         }
       }
     },

src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue

@@ -194,7 +194,7 @@
           placeholder="库区"
           label="cname"
           res="records"
-          :url="'/blade-sales-part/reservoirarea/listZero?current=1&size=5&storageId=' + form.storageId"
+          :url="'/blade-sales-part/reservoirarea/list?current=1&size=5&storageId=' + form.storageId"
           :filterable="true"
           :remote="true"
           dataName="cname"

src/views/tirePartsMall/salesManagement/Inventory/detailsPage.vue

@@ -752,6 +752,14 @@ export default {
             width: 100
           },
           {
+            label: "参考库存融资",
+            prop: "inventoryFinancing",
+            width: 120,
+            disabled: true,
+            hide: true,
+            showColumn: false
+          },
+          {
             label: "参考库存自有",
             prop: "inventoryHave",
             width: 120,
@@ -812,7 +820,7 @@ export default {
           },
           {
             label: "融资数量",
-            prop: "inventoryFinancing",
+            prop: "sendNumFinancing",
             disabled: false,
             hide: true,
             showColumn: false
@@ -1067,6 +1075,9 @@ export default {
           historyList: []
         });
       }
+      this.$nextTick(() => {
+        this.$refs.formContacts.doLayout();
+      });
       this.dialogVisible = false;
     },
     // 导入
@@ -1095,7 +1106,7 @@ export default {
       this.$set(row, "profitLossAmount", Number(row.subTotalMoney) - Number(row.price));
     },
     calculator(row) {
-      console.log(row)
+      console.log(row);
       row.sendNum = Number(Number(row.sendNumFinancing) + Number(row.sendNumHave));
       row.subTotalMoney = Number(Number(row.sendNum) * Number(row.costprie)).toFixed(2);
       row.profitLossNum = Number(row.sendNum) - Number(row.inventory);

src/views/tirePartsMall/salesManagement/outboundWorkOrderL/components/viewArea.vue

@@ -227,7 +227,7 @@ export default {
       });
     },
     addRow() {
-      if (!this.query.dot) {
+      if (!this.query.dot&&this.query.whether == 1) {
         return this.$message.error("请选择批次号!");
       }
       this.data.push({

src/views/tirePartsMall/salesManagement/outboundWorkOrderL/detailsPage.vue

@@ -1159,10 +1159,10 @@ export default {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
-          if (this.whetherFinancing == 1) {
+          if (this.reservoirArea == 1) {
             for (let item of this.form.shipItemsList) {
               if (item.historyList.length == 0) {
-                return this.$message.error("请维护出库明细的库区");
+                return this.$message.error("请维护明细信息的库区");
               }
             }
           }

src/views/tirePartsMall/salesManagement/outboundWorkOrderL/dialogAssembly.vue

@@ -298,8 +298,8 @@ export default {
           this.$set(row, "inventory", item.balanceQuantity);
           this.$set(row, "inventoryFinancing", item.balanceQuantityFinancing);
           this.$set(row, "inventoryHave", item.balanceQuantityHave);
-           this.$set(row, "sendNumFinancing",0);
-            this.$set(row, "sendNumHave",0);
+          this.$set(row, "sendNumFinancing",0);
+          this.$set(row, "sendNumHave",0);
         }
       }
     },

src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -161,7 +161,7 @@
                 <span v-else>{{ row.goodsNum }}</span>
               </template>
               <template slot="sendNum" slot-scope="{ row }">
-              <el-popover v-if="reservoirArea" width="600" trigger="click">
+              <el-popover v-if="reservoirArea==1" width="600" trigger="click">
                   <avue-crud :data="areaData" :option="areaOption"></avue-crud>
                   <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewArea(row)">{{ row.sendNum }}</span>
                 </el-popover>

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -255,7 +255,7 @@
                 <span v-else>{{ row.dot }}</span>
               </template>
               <template slot="sendNum" slot-scope="{ row }">
-                <el-popover v-if="reservoirArea" width="600" trigger="click">
+                <el-popover v-if="reservoirArea==1" width="600" trigger="click">
                   <avue-crud :data="areaData" :option="areaOption"></avue-crud>
                   <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewArea(row)">{{ row.sendNum }}</span>
                 </el-popover>

src/views/tirePartsMall/salesService/inStorage/components/viewArea.vue

@@ -33,14 +33,12 @@
             placeholder="库区"
             label="cname"
             res="records"
-            :url="'/blade-sales-part/reservoirarea/listZero?current=1&size=5&storageId=' + form.storageId"
+            :url="'/blade-sales-part/reservoirarea/list?current=1&size=5&storageId=' + form.storageId"
             :filterable="true"
             :remote="true"
             dataName="cname"
             :disabled="disabled"
             @selectChange="rowDicChange('reservoirAreaName', $event, row)"
-            :slotRight="true"
-            rightLabel="balanceQuantity"
           ></dic-select>
         </template>
         <template slot="quantity" slot-scope="{ row }">
@@ -98,11 +96,6 @@ export default {
             overHidden: true
           },
           {
-            label: "库存",
-            prop: "balanceQuantity",
-            overHidden: true
-          },
-          {
             label: "本次数量",
             prop: "quantity",
             overHidden: true
@@ -135,7 +128,7 @@ export default {
       });
     },
     addRow() {
-      if (!this.query.dot) {
+      if (!this.query.dot&&this.query.whether == 1) {
         return this.$message.error("请选择批次号!");
       }
       if (this.data.length == 0) {
@@ -152,11 +145,9 @@ export default {
       if (name == "reservoirAreaName") {
         if (row) {
           el.reservoirAreaId = row.id;
-          el.balanceQuantity = row.balanceQuantity;
         } else {
           el.reservoirAreaId = null;
           el.reservoirAreaName = null;
-          el.balanceQuantity = null;
         }
       }
     },

src/views/tirePartsMall/salesService/returns/detailsPage.vue

@@ -130,7 +130,7 @@
                 {{ row.goodsName }}
               </template>
               <template slot="sendNum" slot-scope="{ row }">
-                 <el-popover v-if="reservoirArea" width="600" trigger="click">
+                 <el-popover v-if="reservoirArea==1" width="600" trigger="click">
                   <avue-crud :data="areaData" :option="areaOption"></avue-crud>
                   <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewArea(row)">{{ row.sendNum }}</span>
                 </el-popover>