修改bug

src/views/tirePartsMall/basicData/commodityInformation/components/index.vue

@@ -106,6 +106,7 @@ export default {
     },
     //新增修改时保存触发
     rowSave(row, done, loading) {
+      console.log('测试');
       row.corpType = "SP";
       typeSave(row).then(
         res => {
@@ -152,9 +153,9 @@ export default {
     //点击新增时触发
     beforeClose(done) {
       this.parentId = "";
-      // const column = this.findObject(this.option.column, "parentId");
-      // column.value = "";
-      // column.addDisabled = false;
+      const column = this.findObject(this.option.column, "parentId");
+      column.value = "";
+      column.addDisabled = false;
       done();
     },
     //点击搜索按钮触发

src/views/tirePartsMall/basicData/commodityInformation/configuration/mainList.json

@@ -11,7 +11,9 @@
   "tree": true,
   "selection": true,
   "viewBtn": true,
-  "menuWidth": 200,
+  "rowKey":"id",
+  "rowParentKey":"id",
+  "menuWidth": 300,
   "column": [
     {
       "label": "类型",
@@ -49,6 +51,24 @@
       ]
     },
     {
+      "label": "上级类型",
+      "prop": "parentId",
+      "dicData": [],
+      "type": "tree",
+      "hide": true,
+      "showColumn":false,
+      "addDisabled": false,
+      "props": {
+        "label": "cname",
+        "value": "id"
+      },
+      "rules": [{
+      "required": false,
+        "message": "请选择上级机构",
+        "trigger": "click"
+      }]
+    },
+    {
       "label": "排序",
       "prop": "sort",
       "type": "number",

src/views/tirePartsMall/basicData/supplier/configuration/mainList.json

@@ -11,7 +11,7 @@
   "tree": true,
   "selection": true,
   "viewBtn": true,
-  "menuWidth": 200,
+  "menuWidth": 300,
   "column": [
     {
       "label": "类型",
@@ -49,6 +49,24 @@
       ]
     },
     {
+      "label": "上级类型",
+      "prop": "parentId",
+      "dicData": [],
+      "type": "tree",
+      "hide": true,
+      "showColumn":false,
+      "addDisabled": false,
+      "props": {
+        "label": "cname",
+        "value": "id"
+      },
+      "rules": [{
+      "required": false,
+        "message": "请选择上级机构",
+        "trigger": "click"
+      }]
+    },
+    {
       "label": "排序",
       "prop": "sort",
       "type": "number",

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

@@ -7,7 +7,8 @@
         @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 270)" :page.sync="page">
         <template slot-scope="{type,size,row,index}" slot="menu">
           <!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
-          <el-button :size="size" :type="type" :disabled="row.item >= 1" @click="$refs.crud.rowDel(row, index)">删除</el-button>
+          <el-button :size="size" :type="type" :disabled="row.item >= 1"
+            @click="$refs.crud.rowDel(row, index)">删除</el-button>
         </template>
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新采购单</el-button>
@@ -16,12 +17,13 @@
         <template slot-scope="{row,index}" slot="stockClerkName">
           <el-select placeholder="请选择" v-if="row.$cellEdit" v-model="row.stockClerkName" size="small" filterable
             allow-create default-first-option clearable>
-            <el-option v-for="item in stockClerkNameList" :key="item" :label="item.account" :value="item.account"></el-option>
+            <el-option v-for="item in stockClerkNameList" :key="item" :label="item.account"
+              :value="item.account"></el-option>
           </el-select>
           <span v-else>{{ row.stockClerkName }}</span>
         </template>
         <template slot-scope="{type,size,row,$index}" slot="customerId">
-          <span>{{ row.customerName}}</span>
+          <span>{{ row.customerName }}</span>
         </template>
         <template slot-scope="{ row, index }" slot="billno">
           <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 1)">{{ row.billno }}
@@ -168,16 +170,18 @@ export default {
           }],
           // width: 120,
         }, {
-          label: "业务日期",
+          label: '业务日期',
           prop: "createTime",
-          search: true,
+          searchProp: "createTimeList",
+          type: "date",
           overHidden: true,
-          type: "datetime",
-          value: dateFormat(new Date(), 'yyyy-MM-dd hh:mm:ss'),
-          format: "yyyy-MM-dd HH:mm",
-          valueFormat: "yyyy-MM-dd HH:mm:ss",
-          // width: 200
-        }, {
+          search: true,
+          width: 100,
+          searchRange: true,
+          searchDefaultTime: ["00:00:00", "23:59:59"],
+          format: "yyyy-MM-dd HH:mm:ss",
+          valueFormat: "yyyy-MM-dd HH:mm:ss"
+        },{
           label: "库管",
           prop: "stockClerkName",
           search: true,
@@ -315,17 +319,22 @@ export default {
       this.onLoad(this.page, params)
     },
     onLoad(page, params = {}) {
-      console.log(this.search);
+      let storageId = this.search.storageName;
+      let searchWithoutStorageName = { ...this.search };
+      delete searchWithoutStorageName.storageName;
+
       params = {
         ...params,
         current: page.currentPage,
         size: page.pageSize,
         bizTypeName: "SHGD,TKSHGD",
-        ...Object.assign(params, this.search),
-        storageId:this.search.storageName,
-        statusName:this.search.$statusName,
-        stockClerkName:this.search.$stockClerkName
-      }
+        ...Object.assign(params, searchWithoutStorageName),
+        storageId: storageId,
+        statusName: this.search.$statusName,
+        stockClerkName: this.search.$stockClerkName
+      };
+      delete params.storageName;
+      // delete this.search.storageName
       this.loading = true
       getList(params).then(res => {
         this.dataList = res.data.data.records
@@ -336,12 +345,12 @@ export default {
       })
     },
     editOpen(row, status) {
-            this.form = row
-            this.detailData = {
-                id: row.id,
-                status: status
-            };
-            this.detailsOpen = true;
+      this.form = row
+      this.detailData = {
+        id: row.id,
+        status: status
+      };
+      this.detailsOpen = true;
     },
     //自定义列保存
     async saveColumnTwo(ref, option, optionBack, code) {

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

@@ -106,6 +106,12 @@ export default {
           prop: "bsType",
           search: true,
           overHidden: true,
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=business_Source",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          }
         }, {
           label: '业务对象',
           prop: "customerId",
@@ -143,6 +149,12 @@ export default {
           prop: "statusName",
           search: true,
           overHidden: true,
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=outbound_work_order_status",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          }
         }, {
           label: '业务日期',
           prop: "createTime",

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

@@ -395,6 +395,7 @@ export default {
                     }
                 ],
                 addBtnText: "添加轮胎",
+                updateBtnText:'保存',
                 refreshBtn: false,
                 dialogDrag: true,
                 addBtn: false,
@@ -821,6 +822,9 @@ export default {
                     its.disabled = true
                 }
             })
+            this.isSaveBtn = true;
+                    this.isDisabledTask = true;
+                    this.viewDisabled = true;
             // this.$set(this.optionContactsBack, "addBtn", false)
             this['optionContacts'] = this['optionContactsBack'];
             this.delColumnData(this.getColumnName('269.1'), this['optionContactsBack']);
@@ -829,6 +833,7 @@ export default {
             this.editButton = false
             this.isAddBtn = false
             this.isDisabledTask = false;
+            this.isSaveBtn = false
             this.viewDisabled = false;
             this.form.businessSource = '内部销售'
         }
@@ -948,6 +953,9 @@ export default {
                 //     }
                 // })
             }
+            if (this.form.status == '待发货') {
+                this.isAddBtn = true
+            }
             this.optionContactsBack.column.forEach(its => {
                 if (its.prop == 'goodsId' || its.prop == 'goodsNum' || its.prop == 'price' || its.prop == 'dot' || its.prop == 'remarks') {
                     its.disabled = false
@@ -1107,6 +1115,11 @@ export default {
                 // })
                 // this['optionContacts'] = this['optionContactsBack'];
                 // this.delColumnData(this.getColumnName(269.1), this['optionContactsBack']);
+                this.form.outboundRecordsList.forEach(item=>{
+                    if(item.statusName == '待出库'){
+                        this.isDisabledTask = true
+                    }
+                })
                 loading.close()
             }
             // this.$set(this.form.orderItemsList,'goodsNum',66)
@@ -1158,7 +1171,6 @@ export default {
                                             this.refresh(res.data.data.id)
                                             this.isDisabledTask = false
                                             generateShipTask(this.form).then(res => {
-                                                console.log(2);
                                                 console.log(res.data);
                                                 this.refresh(res.data.data.id, true)
                                                 this.isContacts = true
@@ -1355,11 +1367,13 @@ export default {
                     this.isSaveBtn = true;
                     this.isDisabledTask = true;
                     this.viewDisabled = true;
-                } else {
-                    this.isSaveBtn = true;
-                    this.isDisabledTask = true;
-                    this.viewDisabled = true;
-                }
+                } 
+                // else {
+                //     this.isSaveBtn = true;
+                //     this.isDisabledTask = true;
+                //     this.viewDisabled = true;
+                // }
+     
                 if (this.form.status == '退款中') {
                     this.isConfirmRefundBtn = false;
                 }
@@ -1375,7 +1389,6 @@ export default {
                 if (this.form.status == '退款请核' || this.form.status == '退款中') {
                     this.isRevocationRequest = false;
                 }
-
                 //成本、毛利对销售角色隐藏
                 this.optionForm.column.forEach(its => {
                     if (JSON.parse(localStorage.getItem('saber-userInfo')).content.role_name.split(',').includes('销售')) {