轮胎商城采购问题和上下架问题

src/components/bill/selectOrderDetailList.vue

@@ -92,7 +92,10 @@ export default {
   async created() {
     // this.option = await this.getColumnData(this.getColumnName(281), option);
   },
-  methods: {
+    mounted() {
+        // this.onLoad(this.page)
+    },
+    methods: {
     importStagList(row, index) {
       // this.goodsListSave.push(row);
       this.$refs.crud.toggleSelection([row]);
@@ -129,13 +132,13 @@ export default {
       this.goodsListSave = row
     },
     onLoad(page, params) {
-
+        console.log(page,params,133)
       if(params && params.rentStartDate ){
         params.createStartDate = params.rentStartDate[0] + " " + "00:00:00"?params.rentStartDate[0] + " " + "00:00:00":'';
         params.createEndDate = params.rentStartDate[1] + " " + "23:59:59"?params.rentStartDate[1] + " " + "23:59:59":'';
         this.$delete(params, 'rentStartDate')
       }
-       
+
       this.loading = true;
       params = {
         ...params,

src/views/SpecialTrade/dispatchingCars/index.vue

@@ -196,7 +196,7 @@ export default {
                         width: 122,
                         search: true,
                     }, {
-                        label: '提单号',
+                        label: '业务号',
                         prop: 'billNo',
                         index: 4,
                         overHidden: true,
@@ -210,20 +210,20 @@ export default {
                         width: 70,
                         search: true,
                     }, {
-                        label: '计划箱量',
+                        label: '车型',
                         prop: 'ctnDetail',
                         overHidden: true,
                         index: 6,
                         width: 84
                     }, {
-                        label: '已派箱量',
-                        prop: 'dispatchCtnDetail',
+                        label: '风险等级',
+                        prop: 'riskLevel',
                         overHidden: true,
                         index: 7,
                         width: 84
                     }, {
-                        label: '受理箱量',
-                        prop: 'sendCtnDetail',
+                        label: '难度等级',
+                        prop: 'difficultyLevel',
                         overHidden: true,
                         index: 8,
                         width: 94
@@ -315,7 +315,8 @@ export default {
         // }
     },
     async created() {
-        this.option = await this.getColumnData(this.getColumnName(86), this.optionList);
+        // this.option = await this.getColumnData(this.getColumnName(86), this.optionList);
+        this.option = this.optionList
         this.key++
         let i = 0;
         this.option.column.forEach(item => {
@@ -358,7 +359,8 @@ export default {
              * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
              * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
              */
-            const inSave = await this.saveColumnData(this.getColumnName(86), this.option);
+            // const inSave = await this.saveColumnData(this.getColumnName(86), this.option);
+            const inSave = this.option
             if (inSave) {
                 this.$message.success("保存成功");
                 //关闭窗口
@@ -368,7 +370,8 @@ export default {
         //自定义列重置
         async resetColumn() {
             this.option = this.optionList;
-            const inSave = await this.delColumnData(this.getColumnName(86), this.optionList);
+            // const inSave = await this.delColumnData(this.getColumnName(86), this.optionList);
+            const inSave = this.optionList
             if (inSave) {
                 this.$message.success("重置成功");
                 this.$refs.crud.$refs.dialogColumn.columnBox = false;

src/views/SpecialTrade/placeAnOrder/detailPage.vue

@@ -1591,9 +1591,11 @@ export default {
   },
   async created() {
     this.activeIndex = this.roleName.indexOf('调度中心业务员') !== -1 ? '2' : this.roleName.indexOf('调度中心经理') !== -1 ? '2' : '1'
-    this.entrustOptionTwo = await this.getColumnData(this.getColumnName(85.1), this.entrustOptionTwoBackup);
+    // this.entrustOptionTwo = await this.getColumnData(this.getColumnName(85.1), this.entrustOptionTwoBackup);
+      this.entrustOptionTwo = this.entrustOptionTwoBackup
     this.KeyBox++
-    this.entrustOptionTwoT = await this.getColumnData(this.getColumnName(85.2), this.entrustOptionTwoTBackup);
+    // this.entrustOptionTwoT = await this.getColumnData(this.getColumnName(85.2), this.entrustOptionTwoTBackup);
+      this.entrustOptionTwoT = this.entrustOptionTwoTBackup
     this.KeyBoxTwo++
     this.vehicleOption = await this.getColumnData(this.getColumnName(85.3), this.vehicleOptionTwo);
     this.keyContact++
@@ -1858,7 +1860,8 @@ export default {
        * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
        * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
        */
-      const inSave = await this.saveColumnData(this.getColumnName(85.1), this.entrustOptionTwo);
+      // const inSave = await this.saveColumnData(this.getColumnName(85.1), this.entrustOptionTwo);
+      const inSave = this.entrustOptionTwo
       if (inSave) {
         this.$message.success("保存成功");
         //关闭窗口
@@ -1868,7 +1871,8 @@ export default {
     //自定义列重置
     async resetColumnBox() {
       this.entrustOptionTwo = this.entrustOptionTwoBackup;
-      const inSave = await this.delColumnData(this.getColumnName(85.1), this.entrustOptionTwoBackup);
+      // const inSave = await this.delColumnData(this.getColumnName(85.1), this.entrustOptionTwoBackup);
+        const inSave = this.entrustOptionTwoBackup
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs.crudBox.$refs.dialogColumn.columnBox = false;
@@ -1887,7 +1891,8 @@ export default {
        * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
        * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
        */
-      const inSave = await this.saveColumnData(this.getColumnName(85.2), this.entrustOptionTwoT);
+      // const inSave = await this.saveColumnData(this.getColumnName(85.2), this.entrustOptionTwoT);
+      const inSave = this.entrustOptionTwoT
       if (inSave) {
         this.$message.success("保存成功");
         //关闭窗口
@@ -1897,7 +1902,8 @@ export default {
     //自定义列重置
     async resetColumnBoxTwo() {
       this.entrustOptionTwoT = this.entrustOptionTwoTBackup;
-      const inSave = await this.delColumnData(this.getColumnName(85.2), this.entrustOptionTwoTBackup);
+      // const inSave = await this.delColumnData(this.getColumnName(85.2), this.entrustOptionTwoTBackup);
+        const inSave = this.entrustOptionTwoTBackup
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs.crudBoxTwo.$refs.dialogColumn.columnBox = false;

src/views/SpecialTrade/placeAnOrder/index.vue

@@ -283,7 +283,7 @@ export default {
             width: 132,
             search: true,
           }, {
-            label: '提单号',
+            label: '业务号',
             prop: 'billNo',
             index: 4,
             overHidden: true,
@@ -297,20 +297,20 @@ export default {
             width: 70,
             search: true,
           }, {
-            label: '计划箱量',
+            label: '车型',
             prop: 'ctnDetail',
             overHidden: true,
             index: 6,
             width: 78
           }, {
-            label: '已派箱量',
-            prop: 'dispatchCtnDetail',
+            label: '风险等级',
+            prop: 'riskLevel',
             overHidden: true,
             index: 7,
             width: 82
           }, {
-            label: '受理箱量',
-            prop: 'sendCtnDetail',
+            label: '难度等级',
+            prop: 'difficultyLevel',
             overHidden: true,
             index: 8,
             width: 80
@@ -402,7 +402,8 @@ export default {
     }
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(85), this.optionList);
+    // this.option = await this.getColumnData(this.getColumnName(85), this.optionList);
+      this.option = this.optionList
     this.query = {
       arrivalTime: [defaultDate(4)[0] + ' 00:00:00',defaultDate(4)[1] + ' 23:59:59']
     }
@@ -463,7 +464,8 @@ export default {
        * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
        * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
        */
-      const inSave = await this.saveColumnData(this.getColumnName(85), this.option);
+      // const inSave = await this.saveColumnData(this.getColumnName(85), this.option);
+      const inSave = this.option
       if (inSave) {
         this.$message.success("保存成功");
         //关闭窗口
@@ -473,7 +475,8 @@ export default {
     //自定义列重置
     async resetColumn() {
       this.option = this.optionList;
-      const inSave = await this.delColumnData(this.getColumnName(85), this.optionList);
+      // const inSave = await this.delColumnData(this.getColumnName(85), this.optionList);
+        const inSave = this.optionList
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;

src/views/tirePartsMall/basicData/listingManagement/index.vue

@@ -698,18 +698,24 @@ export default {
   onLoad(page, params = {}) {
     console.log(this.search);
     console.log(params);
-    this.search.cname = params.cname
+    // 深拷贝一份防止弹出框的搜索参数和外面表格的搜索参数一样
+    let search = JSON.parse(JSON.stringify(this.search))
+      search.cname = params.cname
+
+    // this.search.cname = params.cname
+
     // params.sharedCompany = params.$sharedCompany
     params = {
       ...params,
       current: page.currentPage,
       size: page.pageSize,
-      ...Object.assign(params, this.search),
+      ...Object.assign(params, search),
+        // ...Object.assign(params, this.search),
       billType: 0
     }
     this.loading = true
     getList(params).then(res => {
-      console.log(res.data.data.total);
+      console.log(res.data.data,712);
       this.dataList = res.data.data.records
       this.page.total = res.data.data.total
       this.pageList.total = res.data.data.total

src/views/tirePartsMall/financialManagement/paymentSettlement/detailsPage.vue

@@ -58,7 +58,7 @@
     </div>
     <el-dialog title="导入订单" append-to-body class="el-dialogDeep" :visible.sync="billDetailDialog" width="80%"
       :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" top="10vh" v-dialog-drag>
-      <bill-detail :params="params" :billType="billType" :flag="1" @closeFun="closeBillDetail"
+      <bill-detail ref="billDetailRef" :params="params" :billType="billType" :flag="1" @closeFun="closeBillDetail"
         @importProMent="importProMent">
       </bill-detail>
     </el-dialog>
@@ -332,7 +332,16 @@ export default {
         bsType: 'CG',
         actualPaymentStatus: '2'
       }
+
       this.billDetailDialog = true;
+      // 调用一次弹窗的方法，防止不刷新数据
+        let page = {
+            pageSize: 20,
+                pagerCount: 1,
+                total: 0,
+                pageSizes: [20, 200, 300, 500, 700, 1000]
+        }
+        this.$refs.billDetailRef.onLoad(page,this.params)
 
     },
     confirmEditing() {

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

@@ -710,7 +710,7 @@ export default {
                 this.$set(this.optionForm, 'disabled', false)
                 this.$set(this.optionContacts, 'disabled', false)
                 this.optionForm.column.forEach(item => {
-                    if (item.prop == 'remarks' || item.prop == 'createTime' || item.prop == 'stockClerkId') {
+                    if (item.prop == 'remarks' || item.prop == 'createTime' || item.prop == 'stockClerkId' || item.prop == 'storageId') {
                         this.$set(item, 'disabled', false)
                     } else {
                         this.$set(item, 'disabled', true)

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

@@ -99,13 +99,15 @@
                                 <span v-else>{{ row.price }}</span>
                             </template>
                             <template slot="dot" slot-scope="{ row }">
-                                <el-select v-if="!mingxibaocun && row.whether=='1'" v-model="row.dot" allow-create filterable default-first-option >
+                                <el-select v-if="!mingxibaocun && row.whether=='1'" v-model="row.dot" allow-create filterable default-first-option @focus="picihaolistfun(row.goodsId)">
                                     <el-option v-for="(item, index) in picihaolist" :key="index" :label="item.dot"
                                         :value="item.dot"></el-option>
                                 </el-select>
                                 <span v-else>{{ row.dot }}</span>
                             </template>
 
+                            <template slot="subTotalMoney" slot-scope="{ row }">{{row.goodsNum * row.price}}</template>
+
                             <template slot="remarks" slot-scope="{ row }">
                                 <el-input v-if="!mingxibaocun" size="small" v-model="row.remarks" style="width: 100%"></el-input>
                                 <span v-else>{{ row.remarks }}</span>
@@ -1316,6 +1318,8 @@ export default {
                         goodsNum:item.goodsNum,
                         units:item.unit,
                         // sendNum:res.data.data[0],
+                        // 小计
+                        subTotalMoney:item.goodsNum * item.price,
                         // 备注
                         remarks:item.remarks,
                         // 判断批次号是否可以编辑
@@ -1406,6 +1410,7 @@ export default {
                 storageId:this.form.storageId,
                 goodsId: goodsId
             }).then(res=>{
+                console.log(res.data,1409)
                 this.picihaolist = res.data.data
                 console.log(res.data.data,1282)
             })
@@ -1801,10 +1806,12 @@ export default {
                         console.log(this.form.orderItemsList[i],1800)
                         if (this.form.orderItemsList[i].pid) {
                         }else {
-                            if(this.form.orderItemsList[i].whether == '1' && this.form.orderItemsList[i].dot){
+                            if(this.form.orderItemsList[i].whether == '1'){
+                                if(this.form.orderItemsList[i].dot){}else {
+                                    this.$message.success(`采购明细序号${i+1}的批次号不能为空`);
+                                    picihao = true
+                                }
                             }else {
-                                this.$message.success(`采购明细序号${i+1}的批次号不能为空`);
-                                picihao = true
                             }
                         }
                     }
@@ -2149,6 +2156,7 @@ export default {
             console.log('新增了', row);
             this.getAllWorkDicts()
             this.refreshChange()
+            this.goodsListSave = []
             this.dialogVisible = true
             // this.$refs.formContacts.rowAdd()
         },

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

@@ -2133,7 +2133,7 @@ export default {
             // }
             this.getAllWorkDicts()
             this.refreshChange()
-
+            this.goodsListSave = []
             setTimeout(res=>{
                 this.dialogVisible = true
             },300)

src/views/wel/components/quick-launch.vue

@@ -220,7 +220,6 @@ export default {
     sysType: Number
   },
   created() {
-    console.log('sysType',this.sysType);
     //从缓存中获取所有路由信息
     let menu = JSON.parse(localStorage.getItem("saber-menuAll")).content
     for (let item of menu){