修改bug

src/api/basicData/salesContract.js

@@ -214,4 +214,12 @@ export function saveShipping(data) {
     method: 'post',
     data: data
   })
+}
+// 客户id查找返利明细
+export function synchronization(query) {
+  return request({
+    url: '/api/blade-purchase-sales/order/synchronization',
+    method: 'get',
+    params: query
+  })
 }

src/views/exportTrade/salesContract/detailsPage.vue

@@ -46,6 +46,7 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item :disabled="!form.id" @click.native="copyDoc">复制单据</el-dropdown-item>
+            <el-dropdown-item @click.native="orderNoVisible=true;orderForm.primaryOrdNo=form.orderNo">更改销售订单号</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
         <el-button type="primary" :disabled="disabled" @click="editCustomer" :loading="subLoading"
@@ -227,7 +228,7 @@
           </template>
           <template slot="orderNo">
             <el-input size="mini" v-model="form.orderNo" oninput="this.value=this.value.toUpperCase()" placeholder="请输入 "
-              :disabled="detailData.status == 1"/>
+              :disabled="detailData.status == 1" />
             <!--:disabled="detailData.status == 1"-->
           </template>
         </avue-form>
@@ -488,6 +489,15 @@
       <check :checkData="checkData" :checkDetail="false" :idList="[]" @choceCheckFun="choceCheckFun">
       </check>
     </el-dialog>
+    <el-dialog title="更改销售订单号" :visible.sync="orderNoVisible" width="350px" size="small" @close="orderClose" append-to-body>
+      <span>
+        <avue-form v-model="orderForm" :option="orderoption"></avue-form>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="orderNoVisible = false">取 消</el-button>
+        <el-button type="primary" @click="upDateOrderNo">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -510,7 +520,9 @@ import {
   getPricedetail,
   pleaseCheck,
   getParities,
-  getCode, generatePurchaseNews
+  getCode,
+  generatePurchaseNews,
+  synchronization
 } from "@/api/basicData/salesContract";
 import {
   getAllBoxs
@@ -563,6 +575,22 @@ export default {
   name: "detailsPageEdit",
   data() {
     return {
+      orderForm:{},
+      orderoption:{
+        submitBtn: false,
+        emptyBtn: false,
+        column: [{
+          label: "原销售订单号",
+          prop: "primaryOrdNo",
+          disabled:true,
+          span:24
+        },{
+          label: "新销售订单号",
+          prop: "ordNo",
+          span:24
+        }]
+      },
+      orderNoVisible:false,
       // 开户银行list
       corpsBankList: [
         { id: 1, accountName: "a" }, { id: 2, accountName: "b" }
@@ -1244,9 +1272,7 @@ export default {
       dateClauseList: [],
       checkDialog: false,
       checkData: {},
-
-
-      transportOption: [],
+      transportOption: []
     };
   },
   props: {
@@ -1437,6 +1463,20 @@ export default {
     copyDoc() {
       this.$emit("copyOrder", this.form.id);
     },
+    upDateOrderNo() {
+      this.orderForm.billId=this.form.id
+      synchronization(this.orderForm).then(res=>{
+        this.$message.success("更改成功");
+        this.getDetail(this.form.id);
+        this.orderNoVisible=false
+      })
+    },
+    orderClose(){
+      this.orderForm={
+        primaryOrdNo:null,
+        ordNo:null
+      }
+    },
     rowCorpData(row) {
       this.data[row.index].corpName = row.code;
     },
@@ -2273,7 +2313,7 @@ export default {
       }
       this.dialogVisible = !this.dialogVisible;
     },
-    oceanUSD(){
+    oceanUSD() {
       this.$refs.feeInfo.oceanUSD()
     },
     getDetail(id) {

src/views/iosBasicData/OceanFreightImport/bills/assembly/formbottom.vue

@@ -107,12 +107,18 @@
                         <span slot="label">
                             <span style="color: #1e9fff">签单方式</span>
                         </span>
-                        <search-query :datalist="issueTypeData" :selectValue="assemblyForm.issueType" :filterable="true"
+                        <!-- <search-query :datalist="issueTypeData" :selectValue="assemblyForm.issueType" :filterable="true"
                             :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
                             :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictValue', }" placeholder="请选择签单方式"
                             @remoteMethod="remoteMethod($event, 'issueType')" @corpChange="corpChange($event, 'issueType')"
                             @corpFocus="remoteMethod($event, 'issueType')">
-                        </search-query>
+                        </search-query> -->
+                        <el-select style="width: 100%" v-model="assemblyForm.issueType" size="small" placeholder="请选择签单方式"
+                            :filterable="true" :clearable="true" :disabled="detailData.seeDisabled">
+                            <el-option v-for="item in issueTypeData" :key="item.dictKey"
+                                :label="item.dictValue" :value="item.dictKey">
+                            </el-option>
+                        </el-select>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
@@ -344,6 +350,7 @@ export default {
     },
     created() {
         // this.cyBcorpslistByType()
+        this.getWorkDictsfun()
     },
     methods: {
         // 远程搜索
@@ -354,10 +361,11 @@ export default {
                 this.cyBcorpslistByType(value)
             } else if (inttraArr.indexOf(name) != -1) {
                 this.inttraBcorpslistByType(value)
-            } else if (name == 'issueType') {
-                // 签单方式
-                this.getWorkDictsfun()
-            }
+            } 
+            // else if (name == 'issueType') {
+            //     // 签单方式
+            //     this.getWorkDictsfun()
+            // }
             // 场站联系人
             else if (name == 'cyContacts') {
                 this.cyBcorpsattnListfun()

src/views/iosBasicData/SeafreightExportF/bills/assembly/formbottom.vue

@@ -129,12 +129,18 @@
                         <span slot="label">
                             <span style="color: #1e9fff">签单方式</span>
                         </span>
-                        <search-query :datalist="issueTypeData" :selectValue="assemblyForm.issueType" :filterable="true"
+                        <!-- <search-query :datalist="issueTypeData" :selectValue="assemblyForm.issueType" :filterable="true"
                             :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
                             :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey', }" placeholder="请选择签单方式"
                             @remoteMethod="remoteMethod($event, 'issueType')" @corpChange="corpChange($event, 'issueType')"
                             @corpFocus="remoteMethod($event, 'issueType')">
-                        </search-query>
+                        </search-query> -->
+                        <el-select style="width: 100%" v-model="assemblyForm.issueType" size="small" placeholder="请选择签单方式"
+                            :filterable="true" :clearable="true" :disabled="detailData.seeDisabled">
+                            <el-option v-for="item in issueTypeData" :key="item.dictKey"
+                                :label="item.dictValue" :value="item.dictKey">
+                            </el-option>
+                        </el-select>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
@@ -144,8 +150,9 @@
                         </span>
                         <search-query :datalist="numberOfData" :selectValue="assemblyForm.numberOfObl" :clearable="true"
                             :disabled="detailData.seeDisabled" :buttonIf="false"
-                            :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictValue', }" placeholder="请选择正本份数"
-                            @corpChange="corpChange($event, 'Obl')" @corpFocus="remoteMethod($event, 'numberOfObl')">
+                            :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictValue', }"
+                            placeholder="请选择正本份数" @corpChange="corpChange($event, 'Obl')"
+                            @corpFocus="remoteMethod($event, 'numberOfObl')">
                         </search-query>
                     </el-form-item>
                 </el-col>
@@ -526,6 +533,7 @@ export default {
     },
     created() {
         // this.cyBcorpslistByType()
+        this.getWorkDictsfun()
     },
     methods: {
         // 远程搜索
@@ -537,10 +545,11 @@ export default {
                 this.cyBcorpslistByType(value)
             } else if (inttraArr.indexOf(name) != -1) {
                 this.inttraBcorpslistByType(value)
-            } else if (name == 'issueType') {
-                // 签单方式
-                this.getWorkDictsfun()
-            }
+            } 
+            // else if (name == 'issueType') {
+            //     // 签单方式
+            //     this.getWorkDictsfun()
+            // }
             // 场站联系人
             else if (name == 'cyContacts') {
                 this.cyBcorpsattnListfun()

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -367,7 +367,7 @@ export default {
                 businessType: 'SE', // 业务类型 默认 海运出口
                 billType: 'DD', // 单据类型 默认 直单
                 accDeptName: '',// 核算部门 默认登录人的部门
-                issueType: 'ORI', // 签单方式 默认 正本提单
+                issueType: "ORI", // 签单方式 默认 正本提单
                 mpaymode: 'PP', // 主单付费方式 默认PP
                 hpaymode: 'PP', // 分单付费方式 默认 PP
                 loadType: 'FCL', // 装箱方式默认整箱

src/views/iosBasicData/periodManagement/detailsPage.vue

@@ -176,10 +176,9 @@ export default {
             getDetails({ id: id, type: type }).then(res => {
                 this.bigObj = res.data.data
                 this.form = res.data.data.periodVouchersTemplate
-                loading.close();
             }).catch(() => {
-                loading.close();
             }).finally(() => {
+                loading.close();
                 this.form.accItems.forEach((e, index) => {
                     if (e.selected == 'true') {
                         this.$refs.crud.toggleRowSelection(e);

src/views/iosBasicData/periodManagement/index.vue

@@ -374,10 +374,10 @@ export default {
                         search: true,
                         dicData: [
                         {
-                                label: '未生成',
+                                label: '未结转',
                                 value: 0,
                             }, {
-                                label: '已生成',
+                                label: '已结转',
                                 value: 1,
                             }
                         ]

src/views/iosBasicData/release/releaseManagement/detailsPage.vue

@@ -1164,6 +1164,7 @@ export default {
                             this.$message.success("保存成功");
                             this.editButton = true;
                             this.optionForm.disabled = true
+                            this.getDetail(this.form.id)
                         }).finally(() => {
                             loading.close();
                         });
@@ -1182,6 +1183,7 @@ export default {
                                     this.$message.success("保存成功");
                                     this.editButton = true;
                                     this.optionForm.disabled = true
+                                    this.getDetail(this.form.id)
                                 }).finally(() => {
                                     loading.close();
                                 });
@@ -1199,6 +1201,7 @@ export default {
                             submit(obj).then(res => {
                                 this.form = res.data.data
                                 this.$message.success("保存成功");
+                                this.getDetail(this.form.id)
                             }).finally(() => {
                                 loading.close();
                             });

src/views/tirePartsMall/inventory/index.vue

@@ -17,6 +17,7 @@
                 @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 268)" :page.sync="page">
                 <template slot-scope="{type,size,row,$index}" slot="menuLeft">
                   <div style="display: flex;align-items: center;">
+                    <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
                     <div style="display: flex;align-items: center;">
                       <div class="buttonBox">
                         <span>库存数量总计：</span>
@@ -45,7 +46,7 @@
             @resetColumn="resetColumnTwo('crudBrand', 'brandOption', 'brandOptionList', 374)"
             @saveColumn="saveColumnTwo('crudBrand', 'brandOption', 'brandOptionList', 374)">
             <template slot-scope="{type,size,row,$index}" slot="menuLeft">
-              <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
+              <el-button type="warning" icon="el-icon-download" size="small" @click="outExport2">导出</el-button>
             </template>
           </avue-crud>
         </el-tab-pane>
@@ -425,6 +426,31 @@ export default {
   methods: {
     // 导出
     outExport() {
+      let config = { params: { ...this.search } }
+      if (config.params) {
+        for (const propName of Object.keys(config.params)) {
+          const value = config.params[propName];
+          if (value !== null && typeof (value) !== "undefined") {
+            if (value instanceof Array) {
+              for (const key of Object.keys(value)) {
+                let params = propName + '[' + key + ']';
+                config.params[params] = value[key]
+              }
+              delete config.params[propName]
+            }
+          }
+        }
+      }
+      const routeData = this.$router.resolve({
+        path: '/api/blade-sales-part/stockDesc/stockExport',      //跳转目标下载地址
+        query: {
+          ...config.params
+        }
+      })
+      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+    },
+        // 导出
+    outExport2() {
       let config = { params: { ...this.brandSearch } }
       if (config.params) {
         for (const propName of Object.keys(config.params)) {

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

@@ -511,12 +511,7 @@ export default {
     this.option.column.forEach(item => {
       if (item.search) i++
     })
-    // if (i % 3 !== 0) {
-    //   const num = 3 - Number(i % 3)
-    //   this.option.searchMenuSpan = num * 8;
-    //   this.option.searchMenuPosition = "right";
-    // }
-    this.getWorkDicts("sales_Status").then(res => {
+    this.getWorkDicts("procurement_Status").then(res => {
       this.orderStatusList = res.data.data
     });
     this.getWorkDicts("settlement_Status").then(res => {