提交bug

src/api/tirePartsMall/salesManagement/saleOrder.js

@@ -142,4 +142,32 @@ export const goodsListAll = () => {
     method: 'get',
   })
 }
-///
+///
+//查询客户
+export const getKh = () => {
+  return request({
+    url: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH&enableOrNot=1',
+    method: 'get',
+  })
+}
+//收款账户下拉
+export const getSk = () => {
+  return request({
+    url: '/api/blade-sales-part/accountManagement/list?enableOrNot=1&billType=HYCK',
+    method: 'get',
+  })
+}
+//所属公司下拉
+export const topList = () => {
+  return request({
+    url: '/api/blade-system/dept/top-list',
+    method: 'get'
+  })
+}
+//制单人下拉
+export const getZd = () => {
+  return request({
+    url: '/api/blade-user/page?size=20&current=1',
+    method: 'get'
+  })
+}

src/components/bill/selectOrderDetailList.vue

@@ -90,7 +90,7 @@ export default {
     }
   },
   async created() {
-    // this.option = await this.getColumnData(this.getColumnName(45), option);
+    // this.option = await this.getColumnData(this.getColumnName(281), option);
   },
   methods: {
     importStagList(row, index) {
@@ -159,7 +159,7 @@ export default {
     //列保存触发
     async saveColumn() {
       const inSave = await this.saveColumnData(
-        this.getColumnName(45),
+        this.getColumnName(281),
         this.option
       );
       if (inSave) {

src/enums/column-name.js

@@ -1230,6 +1230,18 @@ const columnName = [{
   code: 278.1,
   name: '轮胎商城-统计分析-供应商往来-资金往来'
 }, 
+{
+  code: 279,
+  name: '轮胎库存锁定明细'
+},
+{
+  code: 280,
+  name: '上架管理导入库存弹窗'
+}, 
+{
+  code: 281,
+  name: '收付款结算导入销售明细'
+}, 
 ]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

src/router/views/index.js

@@ -2470,6 +2470,45 @@ export default [{
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/productLaunch/index')
   }]
+},{
+  path: '/tirePartsMall/basicData/accountManagement/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/basicData/accountManagement/index',
+    name: '账户管理',
+    meta: {
+      i18n: '/tirePartsMall/basicData/accountManagement/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/basicData/accountManagement/index')
+  }]
+},{
+  path: '/tirePartsMall/basicData/warehouse/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/basicData/warehouse/index',
+    name: '仓库',
+    meta: {
+      i18n: '/tirePartsMall/basicData/warehouse/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/basicData/warehouse/index')
+  }]
+}, {
+  path: '/tirePartsMall/basicData/brandPage/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/basicData/brandPage/index',
+    name: '品牌',
+    meta: {
+      i18n: '/tirePartsMall/basicData/brandPage/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/basicData/brandPage/index')
+  }]
 }, {
   path: '/tirePartsMall/basicData/supplier/index',
   component: Layout,
@@ -2484,6 +2523,19 @@ export default [{
     component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/basicData/supplier/index')
   }]
 }, {
+  path: '/tirePartsMall/basicData/customerInformation/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/basicData/customerInformation/index',
+    name: '客户',
+    meta: {
+      i18n: '/tirePartsMall/basicData/customerInformation/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/basicData/customerInformation/index')
+  }]
+},{
   path: '/tirePartsMall/basicData/commodityInformation/index',
   component: Layout,
   hidden: true,
@@ -2541,20 +2593,33 @@ export default [{
   hidden: true,
   children: [{
     path: '/tirePartsMall/salesManagement/saleOrder/index',
-    name: '销售订单',
+    name: '销售订单(L)',
     meta: {
       i18n: '/tirePartsMall/salesManagement/saleOrder/index',
       keepAlive: true,
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/salesManagement/saleOrder/index')
   }]
-}, {
+},{
+  path: '/tirePartsMall/salesManagement/outboundTask/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/salesManagement/outboundTask/index',
+    name: '出库任务(L)',
+    meta: {
+      i18n: '/tirePartsMall/salesManagement/outboundTask/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/salesManagement/outboundTask/index')
+  }]
+},{
   path: '/tirePartsMall/salesManagement/outboundWorkOrder/index',
   component: Layout,
   hidden: true,
   children: [{
     path: '/tirePartsMall/salesManagement/outboundWorkOrder/index',
-    name: '出库工单',
+    name: '出库工单(L)',
     meta: {
       i18n: '/tirePartsMall/salesManagement/outboundWorkOrder/index',
       keepAlive: true,
@@ -2587,5 +2652,61 @@ export default [{
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/basicData/shareListing/index')
   }]
+},
+{
+  path: '/tirePartsMall/financialManagement/collectionSettlement/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/financialManagement/collectionSettlement/index',
+    name: '收款结算(L)',
+    meta: {
+      i18n: '/tirePartsMall/financialManagement/collectionSettlement/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/financialManagement/collectionSettlement/index')
+  }]
+},
+{
+  path: '/tirePartsMall/financialManagement/collectionSettlement/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/financialManagement/paymentSettlement/index',
+    name: '付款结算(L)',
+    meta: {
+      i18n: '/tirePartsMall/financialManagement/paymentSettlement/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/financialManagement/paymentSettlement/index')
+  }]
+},
+{
+  path: '/tirePartsMall/statisticAnalysis/customerTransactions/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/statisticAnalysis/customerTransactions/index',
+    name: '客户往来',
+    meta: {
+      i18n: '/tirePartsMall/statisticAnalysis/customerTransactions/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/statisticAnalysis/customerTransactions/index')
+  }]
+},
+{
+  path: '/tirePartsMall/statisticAnalysis/supplierTransactions/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/statisticAnalysis/supplierTransactions/index',
+    name: '供应商往来',
+    meta: {
+      i18n: '/tirePartsMall/statisticAnalysis/supplierTransactions/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/statisticAnalysis/supplierTransactions/index')
+  }]
 }
 ]

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -378,7 +378,7 @@
               <template slot="orderQuantity" slot-scope="{row}">
                 <el-input-number v-model="row.orderQuantity" size="small" :controls="false" :precision="0"
                   @input="amountChange(row)" style="width: 100%" />
-              </template>
+              </template> 
               <template slot-scope="scope" slot="menu">
                 <el-button type="text" icon="el-icon-edit" size="small"
                   @click.stop="importStagList(scope.row, scope.index)" v-if="activeName == 'searchList'"

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

@@ -161,11 +161,13 @@ export default {
               message: this.form.id ? "修改成功!" : "新增成功!"
             });
             this.queryData(res.data.data.id);
-            let data = this.form
-            editenable({ id: res.data.data.id, enableOrNot: 1 }).then(res => {
-              this.$set(this.form, 'enableOrNot','1')
-              console.log(this.form);
-            })
+            if (!this.form.id) {
+              //添加成功后默认启用
+              let data = this.form
+              editenable({ id: res.data.data.id, enableOrNot: data.enableOrNot ? 0 : 1 }).then(res => {
+                this.$set(this.form, 'enableOrNot', data.enableOrNot == 1 ? 0 : 1)
+              })
+            }
           }).finally(() => {
             loading.close()
           });

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

@@ -11,7 +11,7 @@
           <el-button type="primary" size="small" @click="editCustomer">
             保存数据
           </el-button>
-          <el-button class="el-button--small-yh"  size="small" v-if="form.id" @click="editEnable">
+          <el-button class="el-button--small-yh" size="small" v-if="form.id" @click="editEnable">
             {{ form.enableOrNot ? '禁用' : '启用' }}
           </el-button>
         </div>
@@ -80,8 +80,8 @@
         </avue-crud>
       </trade-card>
       <containerTitle title="上传附件"></containerTitle>
-      <c-upload v-loading="loadingBtn" typeUpload="CD" deleteUrl="/api/blade-sales-part/corpsfiles/remove" :data="corpsFiles"
-        display :enumerationValue="35.1" :disabled="detailData.status == 1"></c-upload>
+      <c-upload v-loading="loadingBtn" typeUpload="CD" deleteUrl="/api/blade-sales-part/corpsfiles/remove"
+        :data="corpsFiles" display :enumerationValue="35.1" :disabled="detailData.status == 1"></c-upload>
       <el-dialog title="设置客户分类" v-dialogDrag :visible.sync="corpTypeVisible" class="avue-dialog" width="80%"
         append-to-body @closed="corpTypeClosed">
         <span>
@@ -460,7 +460,7 @@ export default {
             label: "使用信用额度",
             prop: "useCreditLimit", span: 8,
             type: "number",
-            disabled:true,
+            disabled: true,
             controls: false,
             precision: 2
           }, {
@@ -576,13 +576,13 @@ export default {
     this.getAllWorkDicts()
     this.getCorpTypeCk()
   },
-  activated () {
-      setTimeout(() => {
-        this.$nextTick(() => {
-          this.$refs.crud.doLayout()
-        })
-      }, 100)
-    },
+  activated() {
+    setTimeout(() => {
+      this.$nextTick(() => {
+        this.$refs.crud.doLayout()
+      })
+    }, 100)
+  },
   methods: {
     // 启用或禁用
     editEnable() {
@@ -816,9 +816,9 @@ export default {
     ,
     //修改提交触发
     editCustomer() {
-      
       this.$refs["form"].validate((valid, done) => {
         done();
+
         if (valid) {
           this.loadingBtn = true;
           submit({
@@ -835,12 +835,13 @@ export default {
             this.data = res.data.data.corpsAddrList
             this.corpsFiles = res.data.data.corpsFilesList
             this.getDetail(res.data.data.id);
-            //添加成功后默认启用
-            let data = this.form
-            editenable({ id: res.data.data.id, enableOrNot: data.enableOrNot ? 0 : 1 }).then(res => {
-              this.$set(this.form, 'enableOrNot', data.enableOrNot == 1 ? 0 : 1)
-
-            })
+            if (!this.form.id) {
+              //添加成功后默认启用
+              let data = this.form
+              editenable({ id: res.data.data.id, enableOrNot: data.enableOrNot ? 0 : 1 }).then(res => {
+                this.$set(this.form, 'enableOrNot', data.enableOrNot == 1 ? 0 : 1)
+              })
+            }
           }).finally(() => {
             this.loadingBtn = false;
           });

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

@@ -55,27 +55,21 @@
         </el-col>
       </el-row>
     </basic-container>
-    <el-dialog title="导入库存" append-to-body class="el-dialogDeep" :visible.sync="dialogVisibles" width="80%"
-      :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" @close="closeGoods">
+    <el-dialog title="导入库存" v-if="dialogVisibles" append-to-body class="el-dialogDeep" :visible.async="dialogVisibles" width="80%"
+      :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" @close="dialogVisibles = false">
       <el-row :style="{ height: rowHeight }">
         <el-col :span="24">
-          <basic-container>
+          <!-- <basic-container> -->
             <avue-crud :option="optionTwo" :table-loading="loading" :data="goodsListShow" ref="cruds"
               @refresh-change="refreshChangeCost" @selection-change="selectionChangeCost" @search-change="goodsSearchCost"
-              :page.sync="pages" @on-load="onLoad">
+              :page.sync="pages" @on-load="onLoad"  @saveColumn="saveGoodsColumn"
+              @resetColumn="resetGoodsColumn">
               <template slot="menuLeft">
                 <el-tabs v-model="activeName" @tab-click="tabHandle">
                   <el-tab-pane label="查询结果" name="searchList" />
                   <el-tab-pane label="已选定数据" name="importStaging" />
                 </el-tabs>
               </template>
-              <!-- <template slot="orderQuantity" slot-scope="{row}">
-                <el-input-number v-model="row.orderQuantity" size="small" :controls="false" :precision="0"
-                  @input="amountChange(row)" style="width: 100%" />
-              </template> -->
-              <!-- <template slot="priceOne" slot-scope="{ row }">
-                <el-input v-model="row.priceOne" size="small" :controls="false" :precision="0"></el-input>
-              </template> -->
               <template slot="priceOne" slot-scope="{row}">
                 <el-input v-model="row.priceOne" size="small" :controls="false" :precision="0"
                   style="width: 100%" />
@@ -112,7 +106,7 @@
                 </el-button>
               </template>
             </avue-crud>
-          </basic-container>
+          <!-- </basic-container> -->
         </el-col>
       </el-row>
       <span slot="footer" class="dialog-footer">
@@ -122,7 +116,7 @@
           :disabled="tableData.length !== 1">导入</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="添加产品" append-to-body :visible.sync="excelBox" :close-on-click-modal="false" width="555px">
+    <el-dialog title="添加产品" v-if="excelBox" append-to-body :visible.sync="excelBox" :close-on-click-modal="false" width="555px">
       <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
         <template slot="excelTemplate">
           <el-button type="primary" @click="derivation">
@@ -265,9 +259,14 @@ export default {
           disabled: true,
           search: true,
           overHidden: true,
+        },{
+          label: '花纹',
+          prop: 'brandItem',
+          disabled: true,
+          overHidden: true,
         }, {
           label: '公司',
-          prop: 'salesCompanyId',
+          prop: 'salesCompanyName',
           disabled: true,
           overHidden: true,
           type: 'select',
@@ -334,7 +333,7 @@ export default {
           // searchProp: "sharedCompanyList",
           search: true,
           overHidden: true,
-          tags: true,
+          // tags: true,
           multiple: true,   //将可选变为多选
           searchMultiple:false,
           type: 'select',
@@ -370,11 +369,16 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(273), this.optionList);
+    this.optionTwo = await this.getColumnData(
+      this.getColumnName(280),
+      this.optionTwo
+    );
     this.key++
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++
     })
+    this.$refs.crud.dicInit()
     if (i % 3 !== 0) {
       const num = 3 - Number(i % 3)
       this.option.searchMenuSpan = num * 8;
@@ -553,7 +557,7 @@ export default {
   goodsListSaveHandle() {
     this.goodsListSave.forEach(item => {
       // item.sharedCompany ? item.sharedCompany.join(',') : ''
-      item.sharedCompany = item.sharedCompany.toString();
+      item.sharedCompany = item.sharedCompany?item.sharedCompany.toString():'';
       this.goodsListSave.specificationAndModel = item.typeno
       delete this.goodsListSave.typeno
       // item.sharedCompany = JSON.stringify(item.sharedCompany)
@@ -709,6 +713,37 @@ export default {
       this.sharedCompanyoptions = res.data.data
     })
   },
+  async saveGoodsColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(280),
+        this.optionTwo
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.cruds.$refs.dialogColumn.columnBox = false;
+        this.$nextTick(() => {
+          this.$refs.cruds.doLayout()
+        })
+      }
+    },
+    async resetGoodsColumn() {
+      this.optionTwo = commodity;
+      const inSave = await this.delColumnData(
+        this.getColumnName(280),
+        commodity
+      );
+      if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.cruds.doLayout()
+        })
+        this.$message.success("重置成功");
+        //关闭窗口
+        setTimeout(() => {
+          this.$refs.cruds.$refs.dialogColumn.columnBox = false;
+        }, 1000);
+      }
+    },
   //自定义列保存
   async saveColumnTwo(ref, option, optionBack, code) {
     /**

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

@@ -174,6 +174,11 @@ export default {
           search: true,
           disabled: true,
           overHidden: true,
+        },{
+          label: '花纹',
+          prop: 'brandItem',
+          disabled: true,
+          overHidden: true,
         }, {
           label: '公司',
           prop: 'salesCompanyId',

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

@@ -318,18 +318,18 @@ export default {
           const addresses = this.form.corpsAddrList;
           console.log(contacts);
           console.log(addresses);
-            //  if (!contacts.length) {
-            //   // 联系人地址为空，阻止保存并显示错误提示
-            //   this.$message.error('联系人不能为空');
-            //   loading.close();
-            //   return;
-            // }
-            // if (!addresses.length) {
-            //   // 地址为空，阻止保存并显示错误提示
-            //   this.$message.error('地址不能为空');
-            //   loading.close();
-            //   return;
-            // }
+          //  if (!contacts.length) {
+          //   // 联系人地址为空，阻止保存并显示错误提示
+          //   this.$message.error('联系人不能为空');
+          //   loading.close();
+          //   return;
+          // }
+          // if (!addresses.length) {
+          //   // 地址为空，阻止保存并显示错误提示
+          //   this.$message.error('地址不能为空');
+          //   loading.close();
+          //   return;
+          // }
           // 验证联系人信息
           for (const contact of contacts) {
             if (!contact.cname || !contact.tel) {
@@ -360,12 +360,13 @@ export default {
             });
             loading.close();
             this.refresh(res.data.data.id)
-            //添加成功后默认启用
-            let data = this.form
-            editenable({ id: res.data.data.id, enableOrNot: data.enableOrNot ? 0 : 1 }).then(res => {
-              this.$set(this.form, 'enableOrNot', data.enableOrNot == 1 ? 0 : 1)
-
-            })
+            if (!this.form.id) {
+              //添加成功后默认启用
+              let data = this.form
+              editenable({ id: res.data.data.id, enableOrNot: data.enableOrNot ? 0 : 1 }).then(res => {
+                this.$set(this.form, 'enableOrNot', data.enableOrNot == 1 ? 0 : 1)
+              })
+            }
           }).catch(() => {
             loading.close();
           })

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

@@ -50,8 +50,9 @@
         </avue-crud>
       </trade-card>
     </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>
+    <el-dialog title="导入订单" v-if="billDetailDialog" 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"
         @importProMent="importProMent">
       </bill-detail>
@@ -448,15 +449,20 @@ export default {
               let data = {
                 ...this.form,
                 dc: 'd',
-                billType: 'SK'
+                billType: 'SK',
+                corpName: this.form.$corpId
               }
-              collectionAndPayment(data).then((res => {
-                this.refresh(res.data.data.id)
-                this.$set(this.optionForm, 'disabled', true)
-                this.$set(this.optionContactsBack, 'disabled', true)
-                this.$message.success('收款成功')
+              saveSubmit(data).then(res => {
+                collectionAndPayment(data).then((res => {
+                  this.refresh(res.data.data.id)
+                  this.$set(this.optionForm, 'disabled', true)
+                  this.$set(this.optionContactsBack, 'disabled', true)
+                  this.$message.success('收款成功')
+                  loading.close()
+                }))
+              }).catch(() => {
                 loading.close()
-              }))
+              })
             })
           } else {
             this.$confirm("确认撤销退款?", {

src/views/tirePartsMall/financialManagement/collectionSettlement/index.vue

@@ -98,7 +98,7 @@ export default {
             label: 'cname',
             value: 'id'
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=0',
+          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=1',
           click: () => {
             console.log('555555');
             this.$refs.crud.dicInit()
@@ -115,19 +115,7 @@ export default {
           },
           dicUrl: '/api/blade-system/dept/top-list'
         }, {
-          label: '收付款状态',
-          prop: "financeStatus",
-          search: true,
-          searchOrder:5,
-          overHidden: true,
-          type: 'select',
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=put_Status",
-          props: {
-            label: "dictValue",
-            value: "dictKey"
-          }
-        }, {
-          label: '收款账户',
+          label: '账户',
           prop: "accountName",
           searchOrder:4,
           search: true,
@@ -143,12 +131,12 @@ export default {
           //   return res.data.records
           // }),
         }, {
-          label: '人民币金额',
+          label: '金额',
           prop: "amount",
           // search: true,
           overHidden: true,
         }, {
-          label: '经办人名称',
+          label: '经办人',
           prop: "handledByName",
           // search: true,
           overHidden: true,
@@ -157,6 +145,18 @@ export default {
             value: "id"
           },
           dicUrl: "/api/blade-user/client/gainUser",
+        },{
+          label: '状态',
+          prop: "financeStatus",
+          search: true,
+          searchOrder:5,
+          overHidden: true,
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=put_Status",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          }
         }, {
           label: "结算日期",
           prop: "settlementDate",
@@ -171,6 +171,20 @@ export default {
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
         },
+        {
+          label: "制单日期",
+          prop: "createTime",
+          // searchProp: "settlementDateList",
+          searchOrder:5,
+          type: "date",
+          // search:true,
+          overHidden: true,
+          width: 100,
+          searchRange: true,
+          searchDefaultTime: ["00:00:00", "23:59:59"],
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss"
+        },
           // {
           //   label: "应结日期",
           //   prop: "dueDate",

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

@@ -35,9 +35,9 @@
               @click="rowAdd()">选择订单</el-button>
           </template>
           <template slot-scope="{ row, index }" slot="contractNumber">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="payBtn(row)">{{ row.contractNumber }}
-          </span>
-        </template>
+            <span style="color: #409EFF;cursor: pointer" @click.stop="payBtn(row)">{{ row.contractNumber }}
+            </span>
+          </template>
           <template slot-scope="{type,size,row,index,disabled}" slot="menu">
             <el-button :size="size" :type="type" :disabled="form.financeStatus == '已付款' || isMenu"
               :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="$refs.formContacts.rowCell(row, index)">{{
@@ -73,7 +73,7 @@ export default {
     return {
       billDetailDialog: false,
       isSave: 0,
-      isMenu:false,
+      isMenu: false,
       isSaveBtn: false,
       isFinanceBtn: false,
       editButton: false,
@@ -130,7 +130,7 @@ export default {
             message: " ",
             trigger: "blur"
           }]
-        },{
+        }, {
           label: "经办人",
           prop: "handledByName",
           type: "select",
@@ -156,7 +156,7 @@ export default {
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
-          value:''
+          value: ''
         }, {
           label: '单据编号',
           prop: "sysNo",
@@ -222,7 +222,7 @@ export default {
                 trigger: "blur"
               }
             ]
-          },{
+          }, {
             label: '备注',
             prop: 'remarks',
             cell: true
@@ -245,8 +245,8 @@ export default {
       this.form.amount = Number(thisAmountSum)
     }
     console.log(this.onLoad.id);
-     //  获取今天的日期
-     var today = new Date();
+    //  获取今天的日期
+    var today = new Date();
     var year = today.getFullYear();
     var month = String(today.getMonth() + 1).padStart(2, '0');
     var day = String(today.getDate()).padStart(2, '0');
@@ -263,7 +263,7 @@ export default {
       this.isSaveBtn = true
       this.isFinanceBtn = true
       this.isMenu = true
-    }else{
+    } else {
       this.findObject(this.optionForm.column, 'settlementDate').value = todayDateTime
       this.editButton = true
     }
@@ -415,19 +415,23 @@ export default {
                 dc: 'c',
                 billType: 'FK'
               }
-              collectionAndPayment(data)
-                .then((res) => {
-                  console.log(res);
-                  this.refresh(res.data.data.id);
-                  this.$set(this.optionForm, 'disabled', true)
-                  this.$set(this.optionContactsBack, 'disabled', true)
-                  this.$message.success('付款成功');
-                  loading.close();
-                })
-                .catch((error) => {
-                  console.error(error);
-                  loading.close();
-                });
+              saveSubmit(data).then(res => {
+                collectionAndPayment(data)
+                  .then((res) => {
+                    console.log(res);
+                    this.refresh(res.data.data.id);
+                    this.$set(this.optionForm, 'disabled', true)
+                    this.$set(this.optionContactsBack, 'disabled', true)
+                    this.$message.success('付款成功');
+                    loading.close();
+                  })
+                  .catch((error) => {
+                    console.error(error);
+                    loading.close();
+                  });
+              }).catch(() => {
+                loading.close()
+              })
             })
           } else {
             this.$confirm("确认撤销付款?", {
@@ -444,7 +448,8 @@ export default {
               let data = {
                 ...this.form,
                 dc: 'c',
-                billType: 'FK'
+                billType: 'FK',
+                corpName: this.form.$corpId
               }
               revokeCollectionAndPayment(data).then((res => {
                 this.refresh(res.data.data.id)
@@ -456,12 +461,12 @@ export default {
         }
       })
     },
-    payBtn(row){
+    payBtn(row) {
       console.log(row);
       this.$router.$avueRouter.closeTag('/tirePartsMall/salesManagement/purchaseOrder/index');
       this.$router.push({
         path: "/tirePartsMall/salesManagement/purchaseOrder/index",
-        query: { detail:row,type:'F'},
+        query: { detail: row, type: 'F' },
       });
     },
     rowSave(form, done, loading) {

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

@@ -103,7 +103,7 @@ export default {
             label: 'cname',
             value: 'id'
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=0',
+          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=1',
         }, {
           label: '账户',
           prop: "accountName",
@@ -125,19 +125,6 @@ export default {
           // search: true,
           overHidden: true,
         }, {
-          label: '付款日期',
-          prop: "settlementDate",
-          searchProp:"settlementDateList",
-          search: true,
-          overHidden: true,
-          type: "date",
-          overHidden: true,
-          width: 100,
-          searchRange: true,
-          searchDefaultTime: ["00:00:00", "23:59:59"],
-          format: "yyyy-MM-dd",
-          valueFormat: "yyyy-MM-dd HH:mm:ss"
-        }, {
           label: '状态',
           prop: "financeStatus",
           search: true,
@@ -148,10 +135,12 @@ export default {
             label: "dictValue",
             value: "dictKey"
           }
-        }, {
-          label: "创建时间",
-          prop: "createTime",
-          searchProp: "createTimeList",
+        },{
+          label: '结算日期',
+          prop: "settlementDate",
+          searchProp:"settlementDateList",
+          search: true,
+          overHidden: true,
           type: "date",
           overHidden: true,
           width: 100,
@@ -159,37 +148,49 @@ export default {
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
-        }, {
-          label: "创建人",
-          prop: "createUserName",
-          searchProp: "createUser",
-          overHidden: true,
-          width: 100,
-          filterable: true,
-          remote: true,
-          type: "select",
-          dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
-          props: {
-            label: "account",
-            value: "id",
-            res: 'data.records'
-          }
-        }, {
-          label: "修改人",
-          prop: "updateUserName",
-          searchProp: "updateUser",
+        },  {
+          label: "制单时间",
+          prop: "createTime",
+          // searchProp: "createTimeList",
+          type: "date",
           overHidden: true,
           width: 100,
-          filterable: true,
-          remote: true,
-          type: "select",
-          dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
-          props: {
-            label: "account",
-            value: "id",
-            res: 'data.records'
-          }
-        }, 
+          searchRange: true,
+          searchDefaultTime: ["00:00:00", "23:59:59"],
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss"
+        },
+        //  {
+        //   label: "创建人",
+        //   prop: "createUserName",
+        //   searchProp: "createUser",
+        //   overHidden: true,
+        //   width: 100,
+        //   filterable: true,
+        //   remote: true,
+        //   type: "select",
+        //   dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
+        //   props: {
+        //     label: "account",
+        //     value: "id",
+        //     res: 'data.records'
+        //   }
+        // }, {
+        //   label: "修改人",
+        //   prop: "updateUserName",
+        //   searchProp: "updateUser",
+        //   overHidden: true,
+        //   width: 100,
+        //   filterable: true,
+        //   remote: true,
+        //   type: "select",
+        //   dicUrl: "/api/blade-user/page?size=20&current=1&account={{key}}",
+        //   props: {
+        //     label: "account",
+        //     value: "id",
+        //     res: 'data.records'
+        //   }
+        // }, 
         // {
         //   label: "更新日期",
         //   prop: "updateTime",

src/views/tirePartsMall/inventory/config/detail.json

@@ -69,7 +69,7 @@
         },
         {
             "label": "减少",
-            "prop": "SubSendTotalNum",
+            "prop": "subSendTotalNum",
             "minWidth": 80,
             "overHidden": true
         },

src/views/tirePartsMall/inventory/detail.vue

@@ -46,7 +46,7 @@
     async created() {
       // this.option = option
       console.log('打开了');
-      this.option = await this.getColumnData(this.getColumnName(67), option);
+      this.option = await this.getColumnData(this.getColumnName(279), option);
       this.$store.commit("DOMAS_IN_DETAIL");
     },
     activated() {
@@ -98,7 +98,7 @@
       },
       async saveColumn() {
         const inSave = await this.saveColumnData(
-          this.getColumnName(67),
+          this.getColumnName(279),
           this.option
         );
         if (inSave) {
@@ -110,7 +110,7 @@
       async resetColumn() {
         this.option = option;
         const inSave = await this.delColumnData(
-          this.getColumnName(67),
+          this.getColumnName(279),
           option
         );
         if (inSave) {

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

@@ -691,7 +691,7 @@ export default {
         //编辑
         confirmEditing() {
             this.isButton = false
-            if (this.form.statusName == '待入库') {
+            if (this.form.statusName == '待入库' || this.form.statusName == '已撤销') {
                 this.isEdit = false
                 this.isrowAdd = false
                 this.$set(this.optionForm, 'disabled', false)
@@ -768,19 +768,25 @@ export default {
                         spinner: 'el-icon-loading',
                         background: 'rgba(255,255,255,0.7)'
                     });
-                    warehousingComplete({
+                    this.form.customerName = this.form.$customerId
+                    submit({
                         ...this.form,
                         bizTypeName: "SHGD"
                     }).then(res => {
-                        this.refresh(res.data.data.id)
-                        this.$set(this.optionForm, 'disabled', true)
-                        this.$set(this.optionContactsBack, 'disabled', true)
-                        this.isEdit = true
-                        this.$message.success("入库完成");
-                        loading.close();
-                    }).finally(() => {
-                        loading.close();
-                    });
+                        warehousingComplete({
+                            ...this.form,
+                            bizTypeName: "SHGD"
+                        }).then(res => {
+                            this.refresh(res.data.data.id)
+                            this.$set(this.optionForm, 'disabled', true)
+                            this.$set(this.optionContactsBack, 'disabled', true)
+                            this.isEdit = true
+                            this.$message.success("入库完成");
+                            loading.close();
+                        }).finally(() => {
+                            loading.close();
+                        });
+                    })
                 }
             })
         },

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

@@ -222,7 +222,7 @@ export default {
             label: 'cname',
             value: 'id'
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=GYS&enableOrNot=0',
+          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=GYS&enableOrNot=1',
         }, {
           label: "仓库",
           prop: "storageName",

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

@@ -106,7 +106,7 @@ export default {
             label: 'cname',
             value: 'id'
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH&enableOrNot=0',
+          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=GYS&enableOrNot=1',
         }
           // , {
           //     label: "商品种类",

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

@@ -103,7 +103,7 @@ export default {
             label: 'cname',
             value: 'id'
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH&enableOrNot=0',
+          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH&enableOrNot=1',
           rules: [{
             required: true,
             message: " ",
@@ -457,6 +457,7 @@ export default {
       this.$refs.formContacts.rowEdit(row, index)
     },
     complete() {
+      console.log(this.form.id);
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
@@ -466,17 +467,24 @@ export default {
             spinner: 'el-icon-loading',
             background: 'rgba(255,255,255,0.7)'
           });
-          warehousingComplete({
+          this.form.shipItemsList.forEach(item => {
+            item.goodsName = item.$goodsId
+          })
+          submit({
             ...this.form,
             bizTypeName: "FHGD"
           }).then(res => {
-            this.$message.success("出库完成");
-            this.refresh(res.data.data.id)
-
-            loading.close();
-          }).finally(() => {
-            loading.close();
-          });
+            warehousingComplete({
+              ...this.form,
+              bizTypeName: "FHGD"
+            }).then(res => {
+              this.$message.success("出库完成");
+              this.refresh(res.data.data.id)
+              loading.close();
+            }).finally(() => {
+              loading.close();
+            });
+          })
         } else {
           this.$message.error('请选择库管')
         }
@@ -547,30 +555,30 @@ export default {
         }).catch(() => {
           loading.close();
         })
-      }else{
-        getDetails({ id:this.detailData.id }).then(res => {
-        if (res.data.data.statusName == '已出库') {
-          this.$set(this.optionForm, 'disabled', true)
+      } else {
+        getDetails({ id: this.detailData.id }).then(res => {
+          if (res.data.data.statusName == '已出库') {
+            this.$set(this.optionForm, 'disabled', true)
+            this.isAddDisabled = true
+            this.optionContacts.column.forEach(item => {
+              if (item.prop == 'sendNum') {
+                item.disabled = true
+              }
+            })
+          }
           this.isAddDisabled = true
-          this.optionContacts.column.forEach(item => {
-            if (item.prop == 'sendNum') {
-              item.disabled = true
-            }
-          })
-        }
-        this.isAddDisabled = true
-        if(res.data.data.statusName == '待出库'){
-              this.isAddDisabled = true
-              this.isDisabled = true
+          if (res.data.data.statusName == '待出库') {
+            this.isAddDisabled = true
+            this.isDisabled = true
           }
-        this.form = res.data.data
-        this.$nextTick(() => {
-          this.$refs.formContacts.refreshTable()
+          this.form = res.data.data
+          this.$nextTick(() => {
+            this.$refs.formContacts.refreshTable()
+          })
+          loading.close();
+        }).catch(() => {
+          loading.close();
         })
-        loading.close();
-      }).catch(() => {
-        loading.close();
-      })
       }
     },
     rowDelBox(row, index) {

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

@@ -777,7 +777,7 @@ export default {
     async created() {
         this.findObject(this.optionContactsBack.column, "goodsId").click = ({ value, column }) => {
             console.log('点击了');
-            this.findObject(this.optionContactsBack.column, "goodsId").dicUrl= "/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}&enableOrNot=1"
+            // this.findObject(this.optionContactsBack.column, "goodsId").dicUrl= "/api/blade-sales-part/goodsDesc/goodsListAll?cname=&enableOrNot=1"
             this.$refs.formContacts.dicInit()
 
          }
@@ -993,10 +993,9 @@ export default {
 
     methods: {
         editBtn(row, index) {
-            console.log(123);
+            // this.findObject(this.optionContactsBack.column, "goodsId").dicUrl= `/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}&enableOrNot=1`
             this.confirmEditing()
             console.log(row);
-            // this.findObject(this.optionContactsBack.column, "goodsId").dicUrl= "/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}&enableOrNot=1"
             this.$refs.formContacts.dicInit()
             this.$refs.formContacts.rowEdit(row, index);
             dotList({
@@ -1694,6 +1693,8 @@ export default {
             // this.form.sharedCompanyName = res.data.data.sharedCompanyName
         },
         rowUpdate(form, index, done, loading) {
+            this.$set(form,'goodsName',form.$goodsId)
+            console.log(form);
             done(form)
         },
         // 新增轮胎

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

@@ -268,7 +268,7 @@ export default {
             label: 'cname',
             value: 'id'
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=0',
+          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=1',
         }, {
           label: '仓库',
           prop: "storageId",

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

@@ -237,6 +237,7 @@ export default {
                                     this.form.phone = res.data.data.corpsAttnList[0].tel
                                     this.contactsOption = res.data.data.corpsAddrList
                                     this.form.recAddress = res.data.data.corpsAddrList[0].belongtoarea + res.data.data.corpsAddrList[0].detailedAddress
+                                    this.form.salerId = res.data.data.salesmanId?res.data.data.salesmanId:''
                                 }
                             })
                         }

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

@@ -273,16 +273,20 @@ export default {
           type: 'select',
           dicData: [
             {
-              label: "待付款",
+              label: "待收款",
               value: 1,
             },
             {
-              label: "已付款",
+              label: "已收款",
               value: 2,
             },
             {
               label: "尾款",
               value: 3,
+            },
+            {
+              label: "已退款",
+              value: 3,
             }
           ],
 

src/views/tirePartsMall/statisticAnalysis/customerTransactions/detailsInfo.vue

@@ -163,8 +163,10 @@
 
 <script>
 import { optionList, sellOption, capitalOption } from "./js/optionList";
-// import { getList, getCorpsAll, gainUser, getCorpType, getAllgoods } from "@/api/basicData/salesOrder";
-import { getList } from "@/api/tirePartsMall/salesManagement/saleOrder";
+import { 
+    // getList, 
+    getCorpsAll, gainUser, getCorpType, getAllgoods } from "@/api/basicData/salesOrder";
+import { getList,getKh,getSk,topList,getZd} from "@/api/tirePartsMall/salesManagement/saleOrder";
 import { pageStatistics, remove, addCorpType, customerList } from "@/api/basicData/customerTransactions";
 import { getDetails, getSellList } from "@/api/basicData/client";
 import { getList as getLists } from "@/api/collectionSettlement/index.js";
@@ -297,10 +299,10 @@ export default {
             this.getColumnName(277.3),
             sellOption
         );
-        this.getWorkDicts("order_status_pjjl").then(res => {
-            this.findObject(this.sellOption.column, "actualPaymentStatus").dicData = res.data.data;
-            this.findObject(this.sellOption.column, "status").dicData = res.data.data;
-        });
+        // this.getWorkDicts("order_status_pjjl").then(res => {
+        //     this.findObject(this.sellOption.column, "actualPaymentStatus").dicData = res.data.data;
+        //     this.findObject(this.sellOption.column, "status").dicData = res.data.data;
+        // });
         this.capitalOption = await this.getColumnData(
             this.getColumnName(277.4),
             capitalOption
@@ -317,9 +319,9 @@ export default {
     },
     methods: {
         getAllWorkDicts() {
-            // gainUser().then(res => {
-            //     this.findObject(this.sellOption.column, "createUser").dicData = res.data.data;
-            // })
+            getZd().then(res => {
+                this.findObject(this.sellOption.column, "createUser").dicData = res.data.data.records;
+            })
             // getCorpType({ corpType: 'KH' }).then(res => {
             //     this.findObject(this.sellOption.column, "corpType").dicData = res.data.data
             // });
@@ -329,6 +331,19 @@ export default {
             // this.getWorkDicts("account").then(res => {
             //     this.findObject(this.capitalOption.column, "account").dicData = res.data.data;
             // });
+            console.log('22222');
+            getKh().then(res=>{
+                this.findObject(this.capitalOption.column, "corpName").dicData = res.data.data
+            })
+            getSk().then(res=>{
+                this.findObject(this.capitalOption.column, "accountName").dicData = res.data.data.records
+            })
+            this.getWorkDicts("payment_Status").then(res => {
+                this.findObject(this.capitalOption.column, "financeStatus").dicData = res.data.data;
+            });
+            topList().then(res=>{
+                this.findObject(this.capitalOption.column, "salesCompanyName").dicData = res.data.data
+            })
         },
         cellStyle() {
             return "padding:0;height:40px;";
@@ -359,19 +374,29 @@ export default {
         },
         onLoad(page, params = {}) {
             let data = this.deepClone(Object.assign(params, this.search));
-            data.billType = 'XS';
-            data.tradeType = 'YPJ';
-            if (data.businesDate) {
-                data.orderStartDate = data.businesDate[0];
-                data.orderEndDate = data.businesDate[1];
-            }
-            delete data.businesDate
-            data.corpId = this.detailData.id;
+            // data.billType = 'XS';
+            // data.tradeType = 'YPJ';
+            // if (data.businesDate) {
+            //     data.orderStartDate = data.businesDate[0];
+            //     data.orderEndDate = data.businesDate[1];
+            // }
+            // delete data.businesDate
+            // data.corpId = this.detailData.id;
             this.loading = true;
             console.log(data);
             //id: id, status: '待确认,待发货,已发货,退款请核', bsType: 'XS' 
             data.status = '待确认,待发货,已发货,退款请核'
-            getList({ customerId: this.detailData.id, status: '待确认,待发货,已发货,退款请核', bsType: 'XS' })
+            
+            // this.search.storageId = this.search.storageName
+            // this.search.createId = this.search.createUser
+            // delete this.search.storageName
+            params.createId = params.createUser
+            params.storageId = params.storageName
+            delete params.storageName
+            delete params.createUser
+            console.log(params);
+            getList({ customerId: this.detailData.id, status: '待确认,待发货,已发货,退款请核', bsType: 'XS', current:page.currentPage,
+            size:page.pageSize,...params})
                 .then(res => {
                     this.sellList = res.data.data.records ? res.data.data.records : [];
                     this.page.total = res.data.data.total;
@@ -388,6 +413,11 @@ export default {
             }
             delete data.settlementDate
             data.corpId = this.detailData.id;
+            data.accountId = data.accountName
+            data.salesCompanyId = data.salesCompanyName
+            delete data.corpName 
+            delete data.accountName
+            delete data.salesCompanyName 
             this.loading = true;
             params = {
                 current: page.currentPage,

src/views/tirePartsMall/statisticAnalysis/customerTransactions/index.vue

@@ -77,8 +77,8 @@
                 </el-button>
                 <el-button type="primary" size="mini" icon="el-icon-bottom" @click="excelBox = true">导入
                 </el-button> -->
-                <!-- <el-button type="primary" size="mini" icon="el-icon-bottom" @click="outExport">导出
-                </el-button> -->
+                <el-button type="primary" size="mini" icon="el-icon-bottom" @click="outExport">导出
+                </el-button>
               </template>
               <template slot-scope="{ row, index }" slot="cname">
                 <span style="color: #409EFF;cursor: pointer" @click.stop="viewInfo(row)">{{ row.cname }}
@@ -338,6 +338,9 @@
       this.option = await this.getColumnData(this.getColumnName(277.1), option);
       this.option.height = window.innerHeight - 330;
       this.getAllWorkDicts()
+      this.findObject(this.option.column,'customerId').click = ()=>{
+        this.$refs.crud.dicInit()
+      }
     },
     activated() {
       this.$refs.crud.refreshTable();
@@ -366,10 +369,12 @@
             }
           }
         }
+        console.log(config.params);
         const routeData = this.$router.resolve({
-          path: '/api/blade-client/partsCorps/export-desc',      //跳转目标窗口的地址
+          path: '/api/blade-sales-part/statisticsCorp/export',      //跳转目标窗口的地址
           query: {
             ...config.params,    //括号内是要传递给新窗口的参数
+            corpType:'KH',
             identification:this.url
           }
         })
@@ -443,6 +448,8 @@
         delete data.date
         data.corpType = "KH"
         this.loading = true;
+        data.id = data.customerId
+        delete data.customerId
         getList(
           page.currentPage,
           page.pageSize,

src/views/tirePartsMall/statisticAnalysis/customerTransactions/js/optionList.js

@@ -22,15 +22,22 @@ export const option = {
       prop: "cname",
       overHidden: true
     },
-    // {
-    //   label: "客户名称",
-    //   prop: "ids",
-    //   type: 'select',
-    //   hide: true,
-    //   showColumn: false,
-    //   search: true,
-    //   index: 2
-    // },
+    {
+      label: '客户名称',
+      prop: "customerId",
+      // searchProp:'id',
+      search: true,
+      remote: true,
+      overHidden: true,
+      hide:true,
+      showColumn:false,
+      type: 'select',
+      props: {
+        label: 'cname',
+        value: 'id'
+      },
+      dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH&cname={{key}}',
+    }, 
     // {
     //   label: "电话",
     //   prop: "tel",
@@ -462,8 +469,9 @@ export const sellOption = {
       type: "select",
       filterable: true,
       props: {
-        label: "name",
-        value: "id"
+        label: "account",
+        value: "id",
+        res: 'data.records'
       },
       dicData: [],
       hide: true,
@@ -503,19 +511,23 @@ export const capitalOption = {
     }, {
       label: "客户",
       prop: "corpName",
-      search: true,
+      filterable:true,
+      // search: true,
       searchOrder:3,
       type: 'select',
+      dicData:[],
       props: {
         label: 'cname',
         value: 'id'
       },
-      dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=0',
+      dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=1',
     }, {
       label: "所属公司",
       prop: "salesCompanyName",
       search: true,
+      filterable:true,
       type: 'select',
+      dicData:[],
       searchOrder:6,
       props: {
         label: 'fullName',
@@ -540,12 +552,12 @@ export const capitalOption = {
       searchOrder:4,
       search: true,
       overHidden: true,
+      filterable:true,
+      dicData:[],
       type: 'select',
-      type:'select',
       props: {
         label: 'cname',
         value: 'id',
-        res: 'data.records'
       },
       dicUrl: '/api/blade-sales-part/accountManagement/list?enableOrNot=1&cname={{key}}&billType=HYCK',
       // dicFormatter: (res => {

src/views/tirePartsMall/statisticAnalysis/supplierTransactions/detailsInfo.vue

@@ -164,7 +164,7 @@
 <script>
 import { optionList, sellOption, capitalOption } from "./js/optionList";
 // import { getList, getCorpsAll, gainUser, getCorpType, getAllgoods } from "@/api/basicData/salesOrder";
-import { getList } from "@/api/tirePartsMall/salesManagement/saleOrder";
+import { getList,getKh,getSk,topList,getZd } from "@/api/tirePartsMall/salesManagement/saleOrder";
 import { pageStatistics, remove, addCorpType, customerList } from "@/api/basicData/customerTransactions";
 import { getDetails, getSellList } from "@/api/basicData/client";
 import {getList as getLists} from "@/api/collectionSettlement/index.js";
@@ -314,6 +314,15 @@ export default {
     },
     methods: {
         getAllWorkDicts() {
+            getSk().then(res=>{
+                this.findObject(this.capitalOption.column, "accountName").dicData = res.data.data.records
+            })
+            this.getWorkDicts("payment_Status").then(res => {
+                this.findObject(this.capitalOption.column, "financeStatus").dicData = res.data.data
+            });
+            topList().then(res=>{
+                this.findObject(this.capitalOption.column, "salesCompanyName").dicData = res.data.data
+            })
             // gainUser().then(res => {
             //     this.findObject(this.sellOption.column, "createUser").dicData = res.data.data;
             // })
@@ -368,7 +377,8 @@ export default {
             console.log(data);
             //id: id, status: '待确认,待发货,已发货,退款请核', bsType: 'XS' 
             data.status = '待确认,待发货,已发货,退款请核'
-            getList({ id: this.detailData.id, status: '待确认,待发货,已发货,退款请核', bsType: 'CG',...data })
+            getList({ id: this.detailData.id, status: '待确认,待发货,已发货,退款请核', bsType: 'CG',...data,current:page.currentPage,
+            size:page.pageSize })
                 .then(res => {
                     this.sellList = res.data.data.records ? res.data.data.records : [];
                     this.page.total = res.data.data.total;
@@ -385,6 +395,10 @@ export default {
             }
             delete data.settlementDate
             data.corpId = this.detailData.id;
+            data.accountId = data.accountName
+            data.salesCompanyId = data.salesCompanyName
+            delete data.accountName
+            delete data.salesCompanyName
             this.loading = true;
             params = {
                 current: page.currentPage,

src/views/tirePartsMall/statisticAnalysis/supplierTransactions/index.vue

@@ -77,8 +77,8 @@
                 </el-button>
                 <el-button type="primary" size="mini" icon="el-icon-bottom" @click="excelBox = true">导入
                 </el-button> -->
-              <!-- <el-button type="primary" size="mini" icon="el-icon-bottom" @click="outExport">导出
-              </el-button> -->
+              <el-button type="primary" size="mini" icon="el-icon-bottom" @click="outExport">导出
+              </el-button>
             </template>
             <template slot-scope="{ row, index }" slot="cname">
               <span style="color: #409EFF;cursor: pointer" @click.stop="viewInfo(row)">{{ row.cname }}
@@ -338,6 +338,9 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(277.2), option);
     this.option.height = window.innerHeight - 330;
     this.getAllWorkDicts()
+    this.findObject(this.option.column,'customerId').click = ()=>{
+        this.$refs.crud.dicInit()
+      }
   },
   activated() {
     this.$refs.crud.refreshTable();
@@ -367,9 +370,10 @@ export default {
         }
       }
       const routeData = this.$router.resolve({
-        path: '/api/blade-client/partsCorps/export-desc',      //跳转目标窗口的地址
+        path: '/api/blade-sales-part/statisticsCorp/export',      //跳转目标窗口的地址
         query: {
           ...config.params,    //括号内是要传递给新窗口的参数
+          corpType:'GYS',
           identification: this.url
         }
       })
@@ -403,7 +407,7 @@ export default {
       // this.getWorkDicts("client_status").then(res => {
       //   this.findObject(this.option.column, "status").dicData = res.data.data;
       // });
-      getCorpType({ corpType: 'KH' }).then(res => {
+      getCorpType({ corpType: 'GYS' }).then(res => {
         this.treeData = res.data.data
       });
       // customerList({ corpType: "KH" }).then(res => {

src/views/tirePartsMall/statisticAnalysis/supplierTransactions/js/optionList.js

@@ -22,15 +22,20 @@ export const option = {
       prop: "cname",
       overHidden: true
     },
-    // {
-    //   label: "客户名称",
-    //   prop: "ids",
-    //   type: 'select',
-    //   hide: true,
-    //   showColumn: false,
-    //   search: true,
-    //   index: 2
-    // },
+    {
+      label: "客户名称",
+      prop: "customerId",
+      type: 'select',
+      remote: true,
+      hide: true,
+      showColumn: false,
+      search: true,
+      props: {
+        label: 'cname',
+        value: 'id'
+      },
+      dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=1',
+    },
     // {
     //   label: "电话",
     //   prop: "tel",
@@ -397,7 +402,7 @@ export const sellOption = {
         label: 'cname',
         value: 'cname'
       },
-      dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=0',
+      dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=1',
     }, {
       label: '仓库',
       prop: "storageName",
@@ -483,7 +488,7 @@ export const capitalOption = {
     }, {
       label: "客户",
       prop: "corpName",
-      search: true,
+      // search: true,
       searchOrder:3,
       type: 'select',
       props: {