提交配件中电

src/components/check/check.vue

@@ -12,6 +12,7 @@
 
 <script>
   import { approvePass,batchOperation } from "@/api/approveData/main";
+  import {offset} from "@/api/basicData/salesOrder";
 
   export default {
     name: "check",
@@ -116,26 +117,66 @@
             this.checkData.auditName = this.form.auditName
             this.checkData.auditMsg = this.form.auditMsg
             this.checkData.auditOpTime = this.form.auditOpTime
-            approvePass(this.checkData).then(res=>{
-              if(res.data.success){
-                this.$message.success("操作成功!")
-                this.$emit("choceCheckFun")
-              }
-              if(!this.checkDetail){
-                //关闭付费申请页面
-                let tag = this.$store.getters.tagList.filter(ele => ele.label === "付费申请")[0]
-                this.$store.commit('DEL_TAG', tag)
-                this.$store.commit("PQ_OUT_DETAIL");
-                let tag1 = this.$store.getters.tagList.filter(ele => ele.label === "审批数据")[0]
-                this.$store.commit('DEL_TAG', tag1)
-                this.$router.push({
-                  path: "/approveData/index",
-                  query: {check:'refresh'},
-                });
-              }
-            }).finally(()=>{
-              this.buttonLoading = false
-            })
+            if (this.checkData.checkType === "YPJ-XSJH" && operate === 1){
+              offset({id: this.checkData.billId}).then(res => {
+                if (res.data.data == '操作成功') {
+                  this.checkData = this.detailData.check;
+                  this.checkDialog = true;
+                } else {
+                  this.$confirm(res.data.data, {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                  }).then(() => {
+                    approvePass(this.checkData).then(res=>{
+                      if(res.data.success){
+                        this.$message.success("操作成功!")
+                        this.$emit("choceCheckFun")
+                      }
+                      if(!this.checkDetail){
+                        //关闭付费申请页面
+                        let tag = this.$store.getters.tagList.filter(ele => ele.label === "付费申请")[0]
+                        this.$store.commit('DEL_TAG', tag)
+                        this.$store.commit("PQ_OUT_DETAIL");
+                        let tag1 = this.$store.getters.tagList.filter(ele => ele.label === "审批数据")[0]
+                        this.$store.commit('DEL_TAG', tag1)
+                        this.$router.push({
+                          path: "/approveData/index",
+                          query: {check:'refresh'},
+                        });
+                      }
+                    }).finally(()=>{
+                      this.buttonLoading = false
+                    })
+                  }).catch(()=>{
+                    this.buttonLoading = false
+                  })
+                }
+              }).catch(()=>{
+                this.buttonLoading = false
+              })
+            }else{
+              approvePass(this.checkData).then(res=>{
+                if(res.data.success){
+                  this.$message.success("操作成功!")
+                  this.$emit("choceCheckFun")
+                }
+                if(!this.checkDetail){
+                  //关闭付费申请页面
+                  let tag = this.$store.getters.tagList.filter(ele => ele.label === "付费申请")[0]
+                  this.$store.commit('DEL_TAG', tag)
+                  this.$store.commit("PQ_OUT_DETAIL");
+                  let tag1 = this.$store.getters.tagList.filter(ele => ele.label === "审批数据")[0]
+                  this.$store.commit('DEL_TAG', tag1)
+                  this.$router.push({
+                    path: "/approveData/index",
+                    query: {check:'refresh'},
+                  });
+                }
+              }).finally(()=>{
+                this.buttonLoading = false
+              })
+            }
           }
         })
       }

src/views/bidingDocument/issueTender/detailsPageEdit.vue

@@ -707,13 +707,25 @@ export default {
           prop: 'seaFreight',
           index:5,
         }, {
+          label: '截单时间',
+          prop: 'cutOffTime',
+          index:6,
+        }, {
+          label: '截港时间',
+          prop: 'harborInterceptionTime',
+          index:7,
+        }, {
+          label: '船期',
+          prop: 'shippingDate',
+          index:8,
+        }, {
           label: '起运港箱使天数',
           prop: 'departureHarborFee',
-          index:6,
+          index:9,
         }, {
           label: '目的港箱使天数',
           prop: 'objectiveHarborFee',
-          index:7,
+          index:10,
         }, {
           label: '状态',
           prop: 'status',
@@ -724,12 +736,12 @@ export default {
             label: "dictValue",
             value: "dictKey"
           },
-          index:8,
+          index:11,
         }, {
           label: '备注',
           prop: 'remark',
           cell: true,
-          index:9,
+          index:12,
         }]
       },
       form: {},
@@ -1103,6 +1115,8 @@ export default {
             message: '发布成功!'
           });
           this.refreshData(this.form.id)
+        }).catch(()=>{
+          loading.close();
         })
       }).catch(() => {
         this.$message({

src/views/businessManagement/deliveryNotice/index.vue

@@ -22,7 +22,9 @@
           <crop-select v-model="search.corpId" corpType="KH"></crop-select>
         </template>
         <template slot="salesCompanySearch">
-          <select-component v-model="search.salesCompany" :configuration="configuration"></select-component>
+<!--          <select-component v-model="search.salesCompany" :configuration="configuration"></select-component>-->
+
+          <crop-select v-model="search.salesCompany" corpType="GS"></crop-select>
         </template>
         <template slot-scope="scope" slot="corpId">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">{{

src/views/product/detailsPage.vue

@@ -142,35 +142,42 @@ export default {
             span: 8,
           },
           {
-            label: "标准售价",
+            label: "零售价",
             prop: "standardPrice",
             type: 'number',
             controls: false,
             span: 8,
           },
           {
-            label: "批发售价",
+            label: "售价1",
             prop: "wholesalePrice",
             type: 'number',
             controls: false,
             span: 8,
           },
           {
-            label: "汽修厂售价",
+            label: "售价2",
             prop: "repairDepotPrice",
             type: 'number',
             controls: false,
             span: 8,
           },
           {
-            label: "门店售价",
+            label: "售价3",
             prop: "storePrice",
             type: 'number',
             controls: false,
             span: 8,
           },
           {
-            label: "采购价",
+            label: "售价4",
+            prop: "price",
+            type: 'number',
+            controls: false,
+            span: 8,
+          },
+          {
+            label: "进货价",
             prop: "purchasePrice",
             type: 'number',
             controls: false,

src/views/salesOrder/detailsPage.vue

@@ -455,21 +455,8 @@ export default {
   methods: {
     //打开审核
     openCheckDialog() {
-      offset({id: this.form.id}).then(res => {
-        if (res.data.data == '操作成功') {
-          this.checkData = this.detailData.check;
-          this.checkDialog = true;
-        } else {
-          this.$confirm(res.data.data, {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(() => {
-            this.checkData = this.detailData.check;
-            this.checkDialog = true;
-          })
-        }
-      })
+      this.checkData = this.detailData.check;
+      this.checkDialog = true;
     },
     //关闭审核
     choceCheckFun() {

src/views/salesOrder/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <basic-container v-show="show" class="page-crad">
-      <avue-crud ref="crud" :option="option" :data="dataList" :page.sync="page" :search.sync="search"
+      <avue-crud :key="key" ref="crud" :option="option" :data="dataList" :page.sync="page" :search.sync="search"
         @search-change="searchChange" @current-change="currentChange" @size-change="sizeChange"
         @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading" @saveColumn="saveColumn"
         @resetColumn="resetColumn" :cell-style="cellStyle" @search-criteria-switch="searchCriteriaSwitch">
@@ -69,6 +69,7 @@ export default {
       detailData: {},
       dataList: [],
       selectionList: [],
+      key:0,
       page: {
         pageSize: 20,
         currentPage: 1,
@@ -154,6 +155,11 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(211), option);
     this.option.height = window.innerHeight - 210;
     this.getAllWorkDicts()
+    this.getWorkDicts("order_status_pjjl").then(res => {
+      this.findObject(this.option.column, "status").dicData = res.data.data;
+      this.findObject(this.option.column, "actualPaymentStatus").dicData = res.data.data;
+      this.key++
+    });
   },
   activated() {
     this.$refs.crud.refreshTable();

src/views/salesOrder/js/optionList.js

@@ -95,14 +95,26 @@ export const option = {
     },
     {
       label: "收款状态",
-      prop: "status",
+      prop: "actualPaymentStatus",
       type: 'select',
+      dataType:"string",
+      dicData:[],
+      props: {
+        label: "dictValue",
+        value: "dictKey"
+      },
       index: 9
     },
     {
       label: "送货状态",
       prop: "status",
       type: 'select',
+      dataType:"string",
+      dicData:[],
+      props: {
+        label: "dictValue",
+        value: "dictKey"
+      },
       // search: true,
       index: 10
     },
@@ -174,7 +186,7 @@ export const optionList = {
       label: "产品",
       prop: "cname",
       width: '250px',
-      overHidden: true
+      // overHidden: true
     },
     {
       label: "图片",
@@ -291,4 +303,4 @@ export const feeOption = {
       overHidden: true
     }
   ]
-}
+}

src/views/salesOrderTwo/detailsPage.vue

@@ -455,21 +455,8 @@ export default {
   methods: {
     //打开审核
     openCheckDialog() {
-      offset({id: this.form.id}).then(res => {
-        if (res.data.data == '操作成功') {
-          this.checkData = this.detailData.check;
-          this.checkDialog = true;
-        } else {
-          this.$confirm(res.data.data, {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(() => {
-            this.checkData = this.detailData.check;
-            this.checkDialog = true;
-          })
-        }
-      })
+      this.checkData = this.detailData.check;
+      this.checkDialog = true;
     },
     //关闭审核
     choceCheckFun() {

src/views/salesOrderTwo/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <basic-container v-show="show" class="page-crad">
-      <avue-crud ref="crud" :option="option" :data="dataList" :page.sync="page" :search.sync="search"
+      <avue-crud :key="key" ref="crud" :option="option" :data="dataList" :page.sync="page" :search.sync="search"
         @search-change="searchChange" @current-change="currentChange" @size-change="sizeChange"
         @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading" @saveColumn="saveColumn"
         @resetColumn="resetColumn" :cell-style="cellStyle" @search-criteria-switch="searchCriteriaSwitch">
@@ -68,6 +68,7 @@ export default {
       search: {},
       detailData: {},
       dataList: [],
+      key:0,
       selectionList: [],
       page: {
         pageSize: 20,
@@ -154,6 +155,11 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(211), option);
     this.option.height = window.innerHeight - 210;
     this.getAllWorkDicts()
+    this.getWorkDicts("order_status_pjjl").then(res => {
+      this.findObject(this.option.column, "status").dicData = res.data.data;
+      this.findObject(this.option.column, "actualPaymentStatus").dicData = res.data.data;
+      this.key++
+    });
   },
   activated() {
     this.$refs.crud.refreshTable();

src/views/salesOrderTwo/js/optionList.js

@@ -95,15 +95,26 @@ export const option = {
     },
     {
       label: "收款状态",
-      prop: "status",
+      prop: "actualPaymentStatus",
       type: 'select',
+      dataType:"string",
+      dicData:[],
+      props: {
+        label: "dictValue",
+        value: "dictKey"
+      },
       index: 9
     },
     {
       label: "送货状态",
       prop: "status",
+      dataType:"string",
       type: 'select',
-      // search: true,
+      dicData:[],
+      props: {
+        label: "dictValue",
+        value: "dictKey"
+      },
       index: 10
     },
     {
@@ -174,7 +185,7 @@ export const optionList = {
       label: "产品",
       prop: "cname",
       width: '250px',
-      overHidden: true
+      // overHidden: true
     },
     {
       label: "图片",
@@ -291,4 +302,4 @@ export const feeOption = {
       overHidden: true
     }
   ]
-}
+}

src/views/statisticAnalysis/analysisOfCoping/detailPageTwo.vue

@@ -85,11 +85,10 @@ export default {
           prop: "orderNo"
         }, {
           label: "客户名称",
-          prop: "corpName"
+          prop: "corpsName"
         }, {
           label: "业务日期",
-          prop: "bsDate",
-          searchProp: "bsDateList",
+          prop: "businesDate",
           width: 100,
           overHidden: true,
           type: "date",
@@ -101,11 +100,8 @@ export default {
           label: "数量",
           prop: "storageQuantity"
         }, {
-          label: "单价",
-          prop: "price"
-        }, {
           label: "金额",
-          prop: "storageQuantity"
+          prop: "debitAmount"
         }]
       }
     };

vue.config.js

@@ -32,10 +32,10 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
-        target: 'http://192.168.0.101:1080',
+        // target: 'http://192.168.0.104:1080',
         // target: 'http://124.222.119.174:1080',
         // 打包地址
-        // target: 'http://121.37.83.47:10004',//服务器ip
+        target: 'http://121.37.83.47:10004',//服务器ip
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {