Merge remote-tracking branch 'origin/master'

src/views/storehouse/inStockManage/inStockPlan/detailsPage.vue

@@ -1329,12 +1329,13 @@ export default {
         if (res instanceof Array) {
           this.form.planItemsList = this.form.planItemsList.concat(res);
           for (let item of this.form.planItemsList) {
-              item.price = item.price ? item.price : 0;
+            item.price = item.price ? item.price : 0;
           }
           res.forEach(item => {
             dotList({
               storageId: this.form.storageId,
-              goodsId: res.goodsId
+              goodsId: res.goodsId,
+              whether: 1
             }).then(e => {
               this.findObject(this.optionContactsBack.column, "dot").dicData = e.data.data;
             });
@@ -1368,7 +1369,8 @@ export default {
         this.findObject(this.excelOption.column, "excelFile").action = "/api/blade-sales-part/order/import-item-name";
         this.templateUrl = "/api/blade-sales-part/order/export-item-name";
       } else if (name == "code") {
-        this.findObject(this.excelOption.column, "excelFile").action = "/api/blade-sales-part/tire/center/warehouse/plan/import-item-code/" + this.form.storageId;
+        this.findObject(this.excelOption.column, "excelFile").action =
+          "/api/blade-sales-part/tire/center/warehouse/plan/import-item-code/" + this.form.storageId;
         this.templateUrl = "/api/blade-sales-part/tire/center/warehouse/plan/exportPlanTemplate";
       }
       this.excelBox = true;
@@ -1520,7 +1522,7 @@ export default {
         let multiList = this.selectionMultilist;
         let arr = this.form.planItemsList;
         // 获取有id 的数据
-        const itemsWithId = multiList.filter(item => item.id);;
+        const itemsWithId = multiList.filter(item => item.id);
         let arrIds = itemsWithId.map(item => item.id); // 获取id 数据
         // 把选中的删除掉
         multiList.forEach(item => {

src/views/storehouse/inStockManage/wordOrder/detailsPage.vue

@@ -614,7 +614,8 @@ export default {
             if (this.formContacts.goodsId !== value) {
                 dotListAll({
                     storageId: this.form.storageId,
-                    goodsId: this.formContacts.goodsId
+                    goodsId: this.formContacts.goodsId,
+                    whether: 1
                 }).then(res => { this.formContacts.price = res.data.data[0].inventoryCostPrice, console.log(res) })
                 goodsDetail({ id: value, stock: this.form.storageId ? this.form.storageId : '' }).then(res => {
                     console.log(this.form.storageId);
@@ -633,7 +634,8 @@ export default {
                         this.findObject(this.optionContacts.column, "dot").disabled = false
                         dotList({
                             storageId: this.form.storageId,
-                            goodsId: this.formContacts.goodsId
+                            goodsId: this.formContacts.goodsId,
+          whether: 1
                         }).then(res => {
                             console.log('dot', res);
                             this.findObject(this.optionContacts.column, "dot").dicData = res.data.data
@@ -655,7 +657,8 @@ export default {
             if (this.formContacts.goodsId !== value) {
                 dotListAll({
                     storageId: this.form.storageId,
-                    goodsId: this.formContacts.goodsId
+                    goodsId: this.formContacts.goodsId,
+                    whether: 1
                 }).then(res => { this.formContacts.price = res.data.data[0].inventoryCostPrice })
                 goodsDetail({ id: value, stock: this.form.storageId ? this.form.storageId : '' }).then(res => {
                     this.formContacts.goodsNo = res.data.data.code
@@ -673,7 +676,8 @@ export default {
                         this.findObject(this.optionContacts.column, "dot").disabled = false
                         dotList({
                             storageId: this.form.storageId,
-                            goodsId: this.formContacts.goodsId
+                            goodsId: this.formContacts.goodsId,
+          whether: 1
                         }).then(res => {
                             console.log('567');
                             this.findObject(this.optionContacts.column, "dot").dicData = res.data.data
@@ -843,7 +847,8 @@ export default {
                     this.findObject(this.optionContacts.column, "dot").disabled = false
                     dotList({
                         storageId: this.form.storageId,
-                        goodsId: this.formContacts.goodsId
+                        goodsId: this.formContacts.goodsId,
+                        whether: 1
                     }).then(res => {
                         console.log('567');
                         this.findObject(this.optionContacts.column, "dot").dicData = res.data.data
@@ -960,7 +965,8 @@ export default {
             // this.confirmEditing()
             dotList({
                 storageId: this.form.storageId,
-                goodsId: row.goodsId
+                goodsId: row.goodsId,
+                whether: 1
             }).then(res => {
                 this.findObject(this.optionContactsBack.column, "dot").dicData = res.data.data
                 // console.log(this.dicData)

src/views/storehouse/outStockManage/outStockPlan/detailsPage.vue

@@ -35,9 +35,15 @@
           :disabled="form.status == 1"
           >提 交
         </el-button>
-          <el-button class="el-button--small-yh" style="margin-left: 6px;" type="warning" size="small"
-                     @click="revokePlan()" v-if="Number(form.status) === 1">撤 销
-          </el-button>
+        <el-button
+          class="el-button--small-yh"
+          style="margin-left: 6px;"
+          type="warning"
+          size="small"
+          @click="revokePlan()"
+          v-if="Number(form.status) === 1"
+          >撤 销
+        </el-button>
         <!-- <el-dropdown v-if="form.status == 1">
                     <el-button style="margin-left: 6px;" type="success" size="small">
                         审 核<i class="el-icon-arrow-down el-icon--right"></i>
@@ -488,7 +494,7 @@
 import { getDetails as getCustom } from "@/api/tirePartsMall/basicData/customerInformation";
 import { getDetails as getDetailsGods } from "@/api/tirePartsMall/basicData/commodityInformation";
 import { goodsListXs, goodsPageXs } from "@/api/tirePartsMall/salesManagement/saleOrder";
-import {getDetails, submitOutPlan, itemRemove, auditPlan, revokePlanOut, feeSubmit} from "@/api/storehouse/plan.js";
+import { getDetails, submitOutPlan, itemRemove, auditPlan, revokePlanOut, feeSubmit } from "@/api/storehouse/plan.js";
 import { dotList, goodsDetail } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
 import reportDialog from "@/components/report-dialog/main";
 import { dateFormat } from "@/util/date";
@@ -1135,21 +1141,21 @@ export default {
     });
   },
   methods: {
-      revokePlan(){
-          this.$confirm('确定要撤销该出库单吗?', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-          }).then(() => {
-              revokePlanOut(this.form.id).then(res => {
-                  this.$message({
-                      type: 'success',
-                      message: '撤销成功!'
-                  });
-                  this.getDetail(this.form.id, true)
-              })
-          })
-      },
+    revokePlan() {
+      this.$confirm("确定要撤销该出库单吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        revokePlanOut(this.form.id).then(res => {
+          this.$message({
+            type: "success",
+            message: "撤销成功!"
+          });
+          this.getDetail(this.form.id, true);
+        });
+      });
+    },
 
     uploadExceed(limit, files, fileList, column) {
       this.$message.error("超出上传限制文件数量");
@@ -1289,7 +1295,8 @@ export default {
           res.forEach(item => {
             dotList({
               storageId: this.form.storageId,
-              goodsId: res.goodsId
+              goodsId: res.goodsId,
+              whether: 1
             }).then(e => {
               this.findObject(this.optionContactsBack.column, "dot").dicData = e.data.data;
             });
@@ -1650,7 +1657,7 @@ export default {
         let multiList = this.selectionMultilist;
         let arr = this.form.planItemsList;
         // 获取有id 的数据
-        const itemsWithId = multiList.filter(item => item.id);;
+        const itemsWithId = multiList.filter(item => item.id);
         let arrIds = itemsWithId.map(item => item.id); // 获取id 数据
         // 把选中的删除掉
         multiList.forEach(item => {

src/views/storehouse/outStockManage/wordOrder/detailsPage.vue

@@ -579,7 +579,8 @@ export default {
       }
       dotList({
         storageId: this.form.storageId,
-        goodsId: row.goodsId
+        goodsId: row.goodsId,
+        whether: 1
       }).then(res => {
         this.findObject(this.optionContacts.column, "dot").dicData = res.data.data
         // 增加监听数据改变更改库存数量

src/views/tirePartsMall/basicData/sharedSales/detailsPage.vue

@@ -1382,7 +1382,8 @@ export default {
                     res.forEach(item => {
                         dotList({
                             storageId: this.form.storageId,
-                            goodsId: res.goodsId
+                            goodsId: res.goodsId,
+                            whether: 1
                         }).then(e => {
                             this.findObject(this.optionContactsBack.column, "dot").dicData = e.data.data
                         })

src/views/tirePartsMall/pointsMall/pointsOrder/detailsPage.vue

@@ -1012,7 +1012,8 @@ export default {
                         this.findObject(this.optionContactsBack.column, "dot").disabled = false
                         dotList({
                             storageId: this.form.storageId,
-                            goodsId: this.formContacts.goodsId
+                            goodsId: this.formContacts.goodsId,
+                            whether: 1
                         }).then(res => {
                             this.findObject(this.optionContactsBack.column, "dot").dicData = res.data.data
                         })
@@ -1061,7 +1062,8 @@ export default {
                         this.findObject(this.optionContacts.column, "dot").disabled = false
                         dotList({
                             storageId: this.form.storageId,
-                            goodsId: this.formContacts.goodsId
+                            goodsId: this.formContacts.goodsId,
+                            whether: 1
                         }).then(res => {
                             this.findObject(this.optionContacts.column, "dot").dicData = res.data.data
                         })
@@ -1179,7 +1181,8 @@ export default {
                     res.forEach(item => {
                         dotList({
                             storageId: this.form.storageId,
-                            goodsId: res.goodsId
+                            goodsId: res.goodsId,
+                            whether: 1
                         }).then(e => {
                             this.findObject(this.optionContactsBack.column, "dot").dicData = e.data.data
                         })
@@ -1485,7 +1488,8 @@ export default {
         picihaolistfun(goodsId) {
             dotList({
                 storageId: this.form.storageId,
-                goodsId: goodsId
+                goodsId: goodsId,
+                whether: 1
             }).then(res => {
                 this.picihaolist = res.data.data
             })
@@ -1511,7 +1515,8 @@ export default {
             this.$refs.formContacts.rowEdit(row, index);
             dotList({
                 storageId: this.form.storageId,
-                goodsId: this.formContacts.goodsId
+                goodsId: this.formContacts.goodsId,
+                whether: 1
             }).then(res => {
                 this.findObject(this.optionContactsBack.column, "dot").dicData = res.data.data
             })

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

@@ -1450,7 +1450,8 @@ export default {
             this.findObject(this.optionContactsBack.column, "dot").disabled = false;
             dotList({
               storageId: this.form.storageId,
-              goodsId: this.formContacts.goodsId
+              goodsId: this.formContacts.goodsId,
+              whether: 1
             }).then(res => {
               this.findObject(this.optionContactsBack.column, "dot").dicData = res.data.data;
             });
@@ -1490,7 +1491,8 @@ export default {
             this.findObject(this.optionContacts.column, "dot").disabled = false;
             dotList({
               storageId: this.form.storageId,
-              goodsId: this.formContacts.goodsId
+              goodsId: this.formContacts.goodsId,
+              whether: 1
             }).then(res => {
               this.findObject(this.optionContacts.column, "dot").dicData = res.data.data;
             });
@@ -1929,7 +1931,8 @@ export default {
     picihaolistfun(goodsId) {
       dotList({
         storageId: this.form.storageId,
-        goodsId: goodsId
+        goodsId: goodsId,
+        whether: 1
       }).then(res => {
         this.picihaolist = res.data.data;
       });
@@ -1941,7 +1944,8 @@ export default {
       this.$refs.formContacts.dicInit();
       dotList({
         storageId: this.form.storageId,
-        goodsId: this.formContacts.goodsId
+        goodsId: this.formContacts.goodsId,
+        whether: 1
       }).then(res => {
         this.findObject(this.optionContactsBack.column, "dot").dicData = res.data.data;
       });
@@ -2671,7 +2675,8 @@ export default {
           res.forEach(item => {
             dotList({
               storageId: this.form.storageId,
-              goodsId: res.goodsId
+              goodsId: res.goodsId,
+              whether: 1
             }).then(e => {
               this.findObject(this.optionContactsBack.column, "dot").dicData = e.data.data;
             });

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

@@ -20,7 +20,7 @@
               placeholder="批次号"
               label="dot"
               :disabled="disabled || query.historyList.length || query.whether != 1"
-              :url="'/blade-sales-part/stockDesc/dotList?storageId=' + form.storageId + '&goodsId=' + query.goodsId"
+              :url="'/blade-sales-part/stockDesc/dotList?storageId=' + form.storageId + '&goodsId=' + query.goodsId+'&whether=1'"
               :filterable="true"
               :allowCreate="true"
             ></dic-select>

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

@@ -772,7 +772,8 @@ export default {
       if (this.formContacts.goodsId !== value) {
         dotListAll({
           storageId: this.form.storageId,
-          goodsId: this.formContacts.goodsId
+          goodsId: this.formContacts.goodsId,
+          whether: 1
         }).then(res => {
           (this.formContacts.price = res.data.data[0].inventoryCostPrice), console.log(res);
         });
@@ -793,7 +794,8 @@ export default {
             this.findObject(this.optionContacts.column, "dot").disabled = false;
             dotList({
               storageId: this.form.storageId,
-              goodsId: this.formContacts.goodsId
+              goodsId: this.formContacts.goodsId,
+              whether: 1
             }).then(res => {
               console.log("dot", res);
               this.findObject(this.optionContacts.column, "dot").dicData = res.data.data;
@@ -818,7 +820,8 @@ export default {
       if (this.formContacts.goodsId !== value) {
         dotListAll({
           storageId: this.form.storageId,
-          goodsId: this.formContacts.goodsId
+          goodsId: this.formContacts.goodsId,
+          whether: 1
         }).then(res => {
           this.formContacts.price = res.data.data[0].inventoryCostPrice;
         });
@@ -838,7 +841,8 @@ export default {
             this.findObject(this.optionContacts.column, "dot").disabled = false;
             dotList({
               storageId: this.form.storageId,
-              goodsId: this.formContacts.goodsId
+              goodsId: this.formContacts.goodsId,
+              whether: 1
             }).then(res => {
               console.log("567");
               this.findObject(this.optionContacts.column, "dot").dicData = res.data.data;
@@ -1111,7 +1115,8 @@ export default {
           this.findObject(this.optionContacts.column, "dot").disabled = false;
           dotList({
             storageId: this.form.storageId,
-            goodsId: this.formContacts.goodsId
+            goodsId: this.formContacts.goodsId,
+            whether: 1
           }).then(res => {
             this.findObject(this.optionContacts.column, "dot").dicData = res.data.data;
           });
@@ -1257,7 +1262,8 @@ export default {
       // this.confirmEditing()
       dotList({
         storageId: this.form.storageId,
-        goodsId: row.goodsId
+        goodsId: row.goodsId,
+        whether: 1
       }).then(res => {
         this.findObject(this.optionContactsBack.column, "dot").dicData = res.data.data;
         // console.log(this.dicData)

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

@@ -20,7 +20,7 @@
               placeholder="批次号"
               label="dot"
               :disabled="disabled || query.historyList.length || query.whether != 1"
-              :url="'/blade-sales-part/stockDesc/dotList?storageId=' + form.storageId + '&goodsId=' + query.goodsId"
+              :url="'/blade-sales-part/stockDesc/dotList?storageId=' + form.storageId + '&goodsId=' + query.goodsId+'&whether=1'"
               :filterable="true"
               :allowCreate="true"
             ></dic-select>

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

@@ -9,7 +9,7 @@
           placeholder="批次号"
           label="dot"
           :disabled="disabled || query.historyList.length|| query.whether != 1"
-          :url="'/blade-sales-part/stockDesc/dotList?storageId=' + form.storageId + '&goodsId=' + query.goodsId"
+          :url="'/blade-sales-part/stockDesc/dotList?storageId=' + form.storageId + '&goodsId=' + query.goodsId+'&whether=1'"
           :filterable="true"
           @selectChange="dicChange('dot', $event)"
         ></dic-select>

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

@@ -785,7 +785,8 @@ export default {
       }
       dotList({
         storageId: this.form.storageId,
-        goodsId: row.goodsId
+        goodsId: row.goodsId,
+        whether: 1
       }).then(res => {
         this.findObject(this.optionContacts.column, "dot").dicData = res.data.data;
         // 增加监听数据改变更改库存数量

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

@@ -755,7 +755,7 @@ export default {
           {
             label: "电话",
             disabled: false,
-            prop: "phone",
+            prop: "phone"
           },
           {
             label: "地址",
@@ -1293,7 +1293,8 @@ export default {
             this.findObject(this.optionContactsBack.column, "dot").disabled = false;
             dotList({
               storageId: this.form.storageId,
-              goodsId: this.formContacts.goodsId
+              goodsId: this.formContacts.goodsId,
+              whether: 1
             }).then(res => {
               this.findObject(this.optionContactsBack.column, "dot").dicData = res.data.data;
             });
@@ -1348,7 +1349,8 @@ export default {
             this.findObject(this.optionContacts.column, "dot").disabled = false;
             dotList({
               storageId: this.form.storageId,
-              goodsId: this.formContacts.goodsId
+              goodsId: this.formContacts.goodsId,
+              whether: 1
             }).then(res => {
               this.findObject(this.optionContacts.column, "dot").dicData = res.data.data;
             });
@@ -1797,7 +1799,8 @@ export default {
       this.$refs.formContacts.dicInit();
       dotList({
         storageId: this.form.storageId,
-        goodsId: this.formContacts.goodsId
+        goodsId: this.formContacts.goodsId,
+        whether: 1
       }).then(res => {
         this.findObject(this.optionContactsBack.column, "dot").dicData = res.data.data;
       });
@@ -2487,7 +2490,8 @@ export default {
           res.forEach(item => {
             dotList({
               storageId: this.form.storageId,
-              goodsId: res.goodsId
+              goodsId: res.goodsId,
+              whether: 1
             }).then(e => {
               this.findObject(this.optionContactsBack.column, "dot").dicData = e.data.data;
             });

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

@@ -9,7 +9,7 @@
           placeholder="批次号"
           label="dot"
           :disabled="disabled || query.historyList.length || query.whether != 1"
-          :url="'/blade-sales-part/stockDesc/dotList?storageId=' + form.storageId + '&goodsId=' + query.goodsId"
+          :url="'/blade-sales-part/stockDesc/dotList?storageId=' + form.storageId + '&goodsId=' + query.goodsId+'&whether=1'"
           :filterable="true"
           @selectChange="dicChange('dot', $event)"
         ></dic-select>

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

@@ -1556,7 +1556,8 @@ export default {
             this.findObject(this.optionContactsBack.column, "dot").disabled = false;
             dotList({
               storageId: this.form.storageId,
-              goodsId: this.formContacts.goodsId
+              goodsId: this.formContacts.goodsId,
+              whether: 1
             }).then(res => {
               this.findObject(this.optionContactsBack.column, "dot").dicData = res.data.data;
             });
@@ -1621,7 +1622,8 @@ export default {
             this.findObject(this.optionContacts.column, "dot").disabled = false;
             dotList({
               storageId: this.form.storageId,
-              goodsId: this.formContacts.goodsId
+              goodsId: this.formContacts.goodsId,
+              whether: 1
             }).then(res => {
               this.findObject(this.optionContacts.column, "dot").dicData = res.data.data;
             });
@@ -1891,7 +1893,8 @@ export default {
           res.forEach(item => {
             dotList({
               storageId: this.form.storageId,
-              goodsId: res.goodsId
+              goodsId: res.goodsId,
+              whether: 1
             }).then(e => {
               this.findObject(this.optionContactsBack.column, "dot").dicData = e.data.data;
             });
@@ -2135,7 +2138,7 @@ export default {
           goodsNumtype: false,
           // 价格
           pricetype: false,
-          historyList:[],
+          historyList: []
           // sendNum: 0,
         };
         if (item.goodsFilesList && item.goodsFilesList.length) {
@@ -2271,7 +2274,8 @@ export default {
       this.$refs.formContacts.rowEdit(row, index);
       dotList({
         storageId: this.form.storageId,
-        goodsId: this.formContacts.goodsId
+        goodsId: this.formContacts.goodsId,
+        whether: 1
       }).then(res => {
         this.findObject(this.optionContactsBack.column, "dot").dicData = res.data.data;
       });

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

@@ -807,7 +807,8 @@ export default {
       if (this.formContacts.goodsId !== value) {
         dotListAll({
           storageId: this.form.storageId,
-          goodsId: this.formContacts.goodsId
+          goodsId: this.formContacts.goodsId,
+          whether: 1
         }).then(res => {
           (this.formContacts.price = res.data.data[0].inventoryCostPrice), console.log(res);
         });
@@ -848,7 +849,8 @@ export default {
       if (this.formContacts.goodsId !== value) {
         dotListAll({
           storageId: this.form.storageId,
-          goodsId: this.formContacts.goodsId
+          goodsId: this.formContacts.goodsId,
+          whether: 1
         }).then(res => {
           this.formContacts.price = res.data.data[0].inventoryCostPrice;
         });