修改bug

src/api/tirePartsMall/purchaseService/saleOrder.js

@@ -12,7 +12,7 @@ export const remove = (data) => {
   return request({
     url: '/api/blade-sales-part/returns/remove',
     method: 'post',
-    data
+    params: data
   })
 }
 //*

src/api/tirePartsMall/salesService/saleOrder.js

@@ -12,7 +12,7 @@ export const remove = (data) => {
   return request({
     url: '/api/blade-sales-part/returns/remove',
     method: 'post',
-    data
+    params: data
   })
 }
 //*

src/views/tirePartsMall/purchaseService/Task/index.vue

@@ -18,7 +18,7 @@
           </el-button> -->
         </template>
         <template slot="corpNameSearch">
-          <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
+          <crop-select v-model="search.corpId" corpType="GYS" :refresh="false"></crop-select>
         </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>-->

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

@@ -298,16 +298,16 @@ export default {
           width: 100
         }, {
           label: '品牌',
-          prop: 'brandId',
+          prop: 'brandName',
           disabled: true,
           width: 100,
           overHidden: true,
-          type: 'select',
-          props: {
-            label: 'cname',
-            value: 'id'
-          },
-          dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP&enableOrNot=1'
+          // type: 'select',
+          // props: {
+          //   label: 'cname',
+          //   value: 'id'
+          // },
+          // dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP&enableOrNot=1'
         }, {
           label: '规格型号',
           prop: 'propertyName',

src/views/tirePartsMall/purchaseService/outStorage/index.vue

@@ -18,7 +18,7 @@
 <!--                     @click="deliverGoods(row)">发货</el-button>-->
         </template>
         <template slot="corpNameSearch">
-          <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
+          <crop-select v-model="search.corpId" corpType="GYS" :refresh="false"></crop-select>
         </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>-->
@@ -250,7 +250,7 @@ export default {
             label: 'cname',
             value: 'id'
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH',
+          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=GYS',
         }, {
           label: '仓库',
           prop: "storageId",
@@ -448,6 +448,7 @@ export default {
     },
     onLoad(page, params = {}) {
       console.log(params);
+      var obj2 = this.deepClone(this.search)
       params = {
         ...params,
         current: page.currentPage,
@@ -473,9 +474,7 @@ export default {
         this.loading = false
       }).finally(() => {
         this.loading = false
-        if(this.search.statusName==''){
-          this.search.statusName='待出库'
-        }
+        this.search=obj2
       })
     },
     editOpen(row, status) {

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

@@ -282,23 +282,23 @@ export default {
                         trigger: "blur"
                     }]
                 },
-                {
-                    label: '业务员',
-                    disabled: true,
-                    prop: "salerId",
-                    type: "select",
-                    props: {
-                        label: "name",
-                        value: "id"
-                    },
-                    dicUrl: "/api/blade-user/client/getUserByRole",
-                    // filterable: true,
-                    // rules: [{
-                    //     required: true,
-                    //     message: " ",
-                    //     trigger: "blur"
-                    // }]
-                },
+                // {
+                //     label: '业务员',
+                //     disabled: true,
+                //     prop: "salerId",
+                //     type: "select",
+                //     props: {
+                //         label: "name",
+                //         value: "id"
+                //     },
+                //     dicUrl: "/api/blade-user/client/getUserByRole",
+                //     // filterable: true,
+                //     // rules: [{
+                //     //     required: true,
+                //     //     message: " ",
+                //     //     trigger: "blur"
+                //     // }]
+                // },
                 {
                     label: '业务日期',
                     prop: "businesDate",
@@ -362,7 +362,7 @@ export default {
                 },
                 {
                     label: "经手人",
-                    prop: "createUserName",
+                    prop: "createUser",
                     disabled: true,
                     type: "select",
                     dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
@@ -677,7 +677,7 @@ export default {
             KHgetList({
                 current: 1,
                 size: 10,
-                corpType: 'KH',
+                corpType: 'GYS',
                 cname: cname ? cname : null,
             }).then(res => {
                 this.customerData = res.data.data.records
@@ -721,6 +721,8 @@ export default {
                         loading.close();
                     }).finally(() => {
                         loading.close();
+                        this.findObject(this.optionForm.column, 'businesDate').disabled = true
+                        this.findObject(this.optionForm.column, 'remarks').disabled = true
                     });
                 } else {
                     return false;
@@ -897,6 +899,9 @@ export default {
             }
             );
         },
+        selectionContacts(list){
+            this.selectionMultilist=list
+        },
         // 一键删除
         batchDelete() {
             if (this.selectionMultilist.length == 0) {

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

@@ -8,15 +8,14 @@
         @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 351)" :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.status != '录入'"
+          <el-button :size="size" :type="type" :disabled="row.status != '录入'||row.numberRows!=0"
             @click="$refs.crud.rowDel(row, index)">删除</el-button>
         </template>
         <template slot="corpNameSearch">
-          <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
+          <crop-select v-model="search.corpId" corpType="GYS" :refresh="false"></crop-select>
         </template>
         <template slot="notCompleteSearch">
-          <el-checkbox v-model="search.notComplete" true-label="1" ></el-checkbox>
+          <el-checkbox v-model="search.notComplete" true-label="1"></el-checkbox>
         </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> -->
@@ -101,16 +100,23 @@ export default {
         }],
         column: [
           {
-            label: '采购单号',
+            label: '业务编号',
             prop: "ordNo",
             search: true,
             overHidden: true,
           },
           {
             label: '往来单位',
-            prop: "salesCompanyName",
+            prop: "customerName",
             search: true,
+            remote: true,
             overHidden: true,
+            type: 'select',
+            props: {
+              label: 'cname',
+              value: 'cname'
+            },
+            dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=GYS&cname={{key}}',
           },
           {
             label: '业务员',
@@ -174,7 +180,7 @@ export default {
             overHidden: true,
           },
           {
-            label: '业务编号',
+            label: '采购单号',
             prop: "srcNo",
             overHidden: true,
           },
@@ -230,21 +236,21 @@ export default {
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
-          {
-            label: "原业务日期",
-            prop: "oldBusinesDate",
-            searchProp: "oldBusinesDateList",
-            type: "date",
-            overHidden: true,
-            width: 100,
-            search: true,
-            searchRange: true,
-            searchDefaultTime: ["00:00:00", "23:59:59"],
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
-            hide: true,
-            showColumn: false
-          },
+          // {
+          //   label: "原业务日期",
+          //   prop: "oldBusinesDate",
+          //   searchProp: "oldBusinesDateList",
+          //   type: "date",
+          //   overHidden: true,
+          //   width: 100,
+          //   search: true,
+          //   searchRange: true,
+          //   searchDefaultTime: ["00:00:00", "23:59:59"],
+          //   format: "yyyy-MM-dd",
+          //   valueFormat: "yyyy-MM-dd HH:mm:ss",
+          //   hide: true,
+          //   showColumn: false
+          // },
           {
             label: '显示已完成',
             prop: 'notComplete',

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

@@ -270,7 +270,7 @@ export default {
         }, {
           label: '业务日期',
           prop: "businesDate",
-          // searchProp: "businesDateList",
+          searchProp: "businesDateList",
           type: "date",
           overHidden: true,
           search: true,
@@ -353,6 +353,7 @@ export default {
     }
   },
   async created() {
+    this.option = await this.getColumnData(this.getColumnName(347), this.optionList);
     customerListAll().then((res) => {
       this.storageNameList = res.data.data
       this.salesCompanyId = this.storageNameList[0].salesCompanyId;
@@ -361,7 +362,6 @@ export default {
         this.stockClerkNameList = res.data.data;
       })
     })
-    this.option = await this.getColumnData(this.getColumnName(274), this.optionList);
     this.key++
     let i = 0;
     this.option.column.forEach(item => {
@@ -433,21 +433,23 @@ export default {
     },
       // 获取业务对象
       corpsDescListAllfun(){
-          corpsDescListAll({corpType:'GYS,KH'}).then(res=>{
+          corpsDescListAll({corpType:'KH'}).then(res=>{
               this.findObject(this.option.column, "customerId").dicData = res.data.data
           })
       },
     onLoad(page, params = {}) {
+
       let storageId = this.search.storageName;
       let searchWithoutStorageName = { ...this.search };
       delete searchWithoutStorageName.storageName;
-
+      var obj2 = this.deepClone(this.search)
+      
       params = {
         ...params,
         current: page.currentPage,
         size: page.pageSize,
         bizTypeName: "THSHGD",
-        ...Object.assign(params, searchWithoutStorageName),
+        ...Object.assign(params,this.search),
         storageId: storageId,
         // statusName: this.search.$statusName,
         stockClerkName: this.search.$stockClerkName
@@ -477,9 +479,11 @@ export default {
         })
         this.loading = false
       }).finally(() => {
-        if(this.search.statusName==''){
-          this.search.statusName='待入库'
-        }
+        // console.log(this.search)
+        this.search=obj2
+        // if(this.search.statusName==''){
+        //   this.search.statusName='待入库'
+        // }
         this.loading = false
       })
     },

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

@@ -81,7 +81,7 @@
                                 <!-- <el-button type="primary" icon="el-icon-printer" size="small"
                                     @click="handlePrint">打印</el-button> -->
                                 <el-button type="danger" plain size="small" @click="batchDelete"
-                                    :disabled="form.checkStatus != '录入'||editButton">一键删除</el-button>
+                                    :disabled="form.checkStatus != '录入' || editButton">一键删除</el-button>
                             </template>
                             <template slot="goodsId" slot-scope="{ row }">
                                 {{ row.goodsName }}
@@ -362,7 +362,7 @@ export default {
                 },
                 {
                     label: "经手人",
-                    prop: "createUserName",
+                    prop: "createUser",
                     disabled: true,
                     type: "select",
                     dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
@@ -718,6 +718,8 @@ export default {
                         loading.close();
                     }).finally(() => {
                         loading.close();
+                        this.findObject(this.optionForm.column, 'businesDate').disabled = true
+                        this.findObject(this.optionForm.column, 'remarks').disabled = true
                     });
                 } else {
                     return false;
@@ -894,6 +896,10 @@ export default {
             }
             );
         },
+        // 监听多选
+        selectionContacts(list){
+            this.selectionMultilist=list
+        },
         // 一键删除
         batchDelete() {
             if (this.selectionMultilist.length == 0) {

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

@@ -8,14 +8,14 @@
         @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 342)" :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.status != '录入'"
+          <el-button :size="size" :type="type" :disabled="row.status != '录入'||row.numberRows!=0"
             @click="$refs.crud.rowDel(row, index)">删除</el-button>
         </template>
         <template slot="corpNameSearch">
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
         </template>
         <template slot="notCompleteSearch">
-          <el-checkbox v-model="search.notComplete" true-label="1" ></el-checkbox>
+          <el-checkbox v-model="search.notComplete" true-label="1"></el-checkbox>
         </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> -->
@@ -92,7 +92,7 @@ export default {
           type: 'sum',
           decimals: 0
         }, {
-          name: 'totalMoney',
+          name: 'returnsNumber',
           type: 'sum',
         }, {
           name: 'returnsAmount',
@@ -100,16 +100,22 @@ export default {
         }],
         column: [
           {
-            label: '销售单号',
+            label: '业务编号',
             prop: "ordNo",
             search: true,
             overHidden: true,
           },
           {
             label: '往来单位',
-            prop: "salesCompanyName",
+            prop: "customerName",
             search: true,
             overHidden: true,
+            type: 'select',
+            props: {
+              label: 'cname',
+              value: 'cname'
+            },
+            dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH&cname={{key}}',
           },
           {
             label: '业务员',
@@ -163,17 +169,12 @@ export default {
             overHidden: true,
           },
           {
-            label: '金额',
-            prop: "totalMoney",
-            overHidden: true,
-          },
-          {
             label: '退货金额',
             prop: "returnsAmount",
             overHidden: true,
           },
           {
-            label: '业务编号',
+            label: '销售单号',
             prop: "srcNo",
             overHidden: true,
           },
@@ -229,21 +230,21 @@ export default {
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
-          {
-            label: "原业务日期",
-            prop: "oldBusinesDate",
-            searchProp: "oldBusinesDateList",
-            type: "date",
-            overHidden: true,
-            width: 100,
-            search: true,
-            searchRange: true,
-            searchDefaultTime: ["00:00:00", "23:59:59"],
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
-            hide: true,
-            showColumn: false
-          },
+          // {
+          //   label: "原业务日期",
+          //   prop: "oldBusinesDate",
+          //   searchProp: "oldBusinesDateList",
+          //   type: "date",
+          //   overHidden: true,
+          //   width: 100,
+          //   search: true,
+          //   searchRange: true,
+          //   searchDefaultTime: ["00:00:00", "23:59:59"],
+          //   format: "yyyy-MM-dd",
+          //   valueFormat: "yyyy-MM-dd HH:mm:ss",
+          //   hide: true,
+          //   showColumn: false
+          // },
           {
             label: '显示已完成',
             prop: 'notComplete',