货代 2024-3-29

src/api/tirePartsMall/basicData/customerInformation/index.js

@@ -86,4 +86,12 @@ export function editenable(data) {
     method: 'get',
     params: data
   })
-}
+}
+// 查询业务员
+export function getUserByRole(data) {
+  return request({
+    url: '/api/blade-user/client/getUserByRole',
+    method: 'get',
+    params: data
+  })
+}

src/components/iosbasic-data/searchquery.vue

@@ -38,13 +38,6 @@
                    class="el-dialogDeep" :close-on-click-modal="false" v-dialog-drag>
              <div>
                  <el-row>
-                     <!--<el-col :span="4">-->
-                     <!--    <el-scrollbar>-->
-                     <!--        <basic-container>-->
-                     <!--            <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" :style="treeStyle" />-->
-                     <!--        </basic-container>-->
-                     <!--    </el-scrollbar>-->
-                     <!--</el-col>-->
                      <el-col :span="24">
                          <slot></slot>
                      </el-col>

src/views/financialManagementF/agreementprice/agreementpriceitems.vue

@@ -529,11 +529,12 @@ export default {
         },
         // 费用详细关闭
         agreementPriceClose(done){
-            this.$confirm('确认关闭？')
-                .then(_ => {
-                    done();
-                })
-                .catch(_ => {});
+            done();
+            // this.$confirm('确认关闭？')
+            //     .then(_ => {
+            //         done();
+            //     })
+            //     .catch(_ => {});
         },
         //返回列表
         backToList() {

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

@@ -1087,10 +1087,10 @@
                         name:'MBLNO',
                         value:'mblno',
                     },
-                    {
-                        name:'REF MBLNO',
-                        value:'refno',
-                    },
+                    // {
+                    //     name:'REF MBLNO',
+                    //     value:'refno',
+                    // },
                     {
                         name:'船名(VSL)',
                         value:'vesselCnName',
@@ -1123,10 +1123,10 @@
                         name:'船公司',
                         value:'carrierCnName',
                     },
-                    {
-                        name:'场站',
-                        value:'cyCnName',
-                    },
+                    // {
+                    //     name:'场站',
+                    //     value:'cyCnName',
+                    // },
                     {
                         name:'所属团队',
                         value:'teamId',
@@ -1405,34 +1405,34 @@
                     obj.corpId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].corpId
                     obj.corpCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].corpCnName
                     obj.corpEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].corpEnName
-                    // 费用简称
-                    obj.feeId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeId
-                    obj.feeCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeCnName
-                    obj.feeEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeEnName
-                    obj.feeCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeCode
-                    // 核算要素
-                    obj.elementsId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsId
-                    obj.elementsCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsCnName
-                    obj.elementsEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsEnName
-                    obj.elementsCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsCode
+                    // // 费用简称
+                    // obj.feeId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeId
+                    // obj.feeCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeCnName
+                    // obj.feeEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeEnName
+                    // obj.feeCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeCode
+                    // // 核算要素
+                    // obj.elementsId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsId
+                    // obj.elementsCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsCnName
+                    // obj.elementsEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsEnName
+                    // obj.elementsCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsCode
                     // 预付/到付
                     obj.paymode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].paymode
-                    // 计量单位
-                    obj.unitNo = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].unitNo
-                    // 币种
-                    obj.curCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].curCode
-                    obj.taxRate = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].taxRate
-                    // 汇率
-                    obj.exrate = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].exrate
-                    // 单价
-                    obj.price = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].price
-                    // 数量
-                    obj.quantity = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].quantity
-                    // 金额
-                    obj.rmbAmount = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].rmbAmount
-                    obj.usdAmount = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].usdAmount
-                    obj.rmbAmountNet = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].rmbAmountNet
-                    obj.usdAmountNet = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].usdAmountNet
+                    // // 计量单位
+                    // obj.unitNo = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].unitNo
+                    // // 币种
+                    // obj.curCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].curCode
+                    // obj.taxRate = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].taxRate
+                    // // 汇率
+                    // obj.exrate = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].exrate
+                    // // 单价
+                    // obj.price = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].price
+                    // // 数量
+                    // obj.quantity = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].quantity
+                    // // 金额
+                    // obj.rmbAmount = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].rmbAmount
+                    // obj.usdAmount = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].usdAmount
+                    // obj.rmbAmountNet = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].rmbAmountNet
+                    // obj.usdAmountNet = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].usdAmountNet
                 }else {
                     // 往来单位拿主表客户名称
                     obj.corpId = this.assemblyForm.corpId
@@ -1479,34 +1479,34 @@
                     obj.corpId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].corpId
                     obj.corpCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].corpCnName
                     obj.corpEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].corpEnName
-                    // 费用简称
-                    obj.feeId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeId
-                    obj.feeCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeCnName
-                    obj.feeEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeEnName
-                    obj.feeCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeCode
-                    // 核算要素
-                    obj.elementsId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsId
-                    obj.elementsCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsCnName
-                    obj.elementsEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsEnName
-                    obj.elementsCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsCode
+                    // // 费用简称
+                    // obj.feeId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeId
+                    // obj.feeCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeCnName
+                    // obj.feeEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeEnName
+                    // obj.feeCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeCode
+                    // // 核算要素
+                    // obj.elementsId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsId
+                    // obj.elementsCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsCnName
+                    // obj.elementsEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsEnName
+                    // obj.elementsCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsCode
                     // 预付/到付
                     obj.paymode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].paymode
-                    // 计量单位
-                    obj.unitNo = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].unitNo
-                    // 币种
-                    obj.curCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].curCode
-                    obj.taxRate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].taxRate
-                    // 汇率
-                    obj.exrate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].exrate
-                    // 单价
-                    obj.price = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].price
-                    // 数量
-                    obj.quantity = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].quantity
-                    // 金额
-                    obj.rmbAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmount
-                    obj.usdAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmount
-                    obj.rmbAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmountNet
-                    obj.usdAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmountNet
+                    // // 计量单位
+                    // obj.unitNo = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].unitNo
+                    // // 币种
+                    // obj.curCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].curCode
+                    // obj.taxRate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].taxRate
+                    // // 汇率
+                    // obj.exrate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].exrate
+                    // // 单价
+                    // obj.price = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].price
+                    // // 数量
+                    // obj.quantity = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].quantity
+                    // // 金额
+                    // obj.rmbAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmount
+                    // obj.usdAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmount
+                    // obj.rmbAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmountNet
+                    // obj.usdAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmountNet
                 }else {
                     // 往来单位拿主表客户名称
                     obj.corpId = this.assemblyForm.corpId
@@ -2554,13 +2554,16 @@
             },
             // 关闭弹窗
             handleClose(done) {
-                this.$confirm('确认关闭？')
-                    .then(_ => {
-                        this.feesselectionList = [] // 清空多选
-                        this.templateRightData = [] // 清空数据
-                        done();
-                    })
-                    .catch(_ => {});
+                this.feesselectionList = [] // 清空多选
+                this.templateRightData = [] // 清空数据
+                done();
+                // this.$confirm('确认关闭？')
+                //     .then(_ => {
+                //         this.feesselectionList = [] // 清空多选
+                //         this.templateRightData = [] // 清空数据
+                //         done();
+                //     })
+                //     .catch(_ => {});
             },
             //自定义列保存
             async saveColumnTwo(ref, option, optionBack, code) {

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

@@ -1193,13 +1193,13 @@ import {getWorkDicts} from "@/api/system/dictbiz";
                             if (name == 'pol') {
                                 this.$set(this.assemblyForm,'issueAt',this.assemblyForm.polCnName)
                             }
-                            // 选择卸货港带出目的地
-                            if(name == 'pod') {
-                                this.$set(this.assemblyForm,'destinationId',item.id)
-                                this.$set(this.assemblyForm,'destinationName',item.enName)
-                                this.$set(this.assemblyForm,'destinationCode',item.code)
-                                this.$set(this.assemblyForm,'destinationNamePrint',item.enName)
-                            }
+                            // // 选择卸货港带出目的地
+                            // if(name == 'pod') {
+                            //     this.$set(this.assemblyForm,'destinationId',item.id)
+                            //     this.$set(this.assemblyForm,'destinationName',item.enName)
+                            //     this.$set(this.assemblyForm,'destinationCode',item.code)
+                            //     this.$set(this.assemblyForm,'destinationNamePrint',item.enName)
+                            // }
                         }
                     }
                 }

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -213,7 +213,7 @@ import {
               prop: "temperature",
               cell:true,
               controls:false,
-              type:"number",
+              // type:"number",
               width: "120"
             },
             {
@@ -234,7 +234,7 @@ import {
               prop: "ventilation",
               cell:true,
               controls:false,
-              type:"number",
+              // type:"number",
               width: "120"
             },
             {
@@ -242,7 +242,7 @@ import {
               prop: "humidity",
               cell:true,
               controls:false,
-              type:"number",
+              // type:"number",
               width: "120"
             },
             {

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

@@ -94,6 +94,25 @@
                             </el-form-item>
                         </el-col>
                     </el-row>
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="PIL HBL" prop="pilHbl" >
+                                <span slot="label">
+                                    <span style="color: #1e9fff">PIL HBL</span>
+                                </span>
+                                <search-query :datalist="pilHblData"
+                                              :selectValue="assemblyForm.pilHbl"
+                                              :clearable="true"
+                                              :disabled="detailData.seeDisabled"
+                                              :buttonIf="false"
+                                              :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey',}"
+                                              placeholder="请选择PIL HBL"
+                                              @corpChange="pilHblChange"
+                                              @corpFocus="pilHblfun" >
+                                </search-query>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
                     <el-form-item label="SI备注" prop="siRemarks" >
                         <span slot="label">
                             <span style="color: #1e9fff">SI备注</span>
@@ -112,7 +131,11 @@
 </template>
 
 <script>
+    import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+    import {getWorkDicts} from "@/api/system/dictbiz";
+
     export default {
+        components: {SearchQuery},
         props:{
             assemblyForm:{
                 type:Object
@@ -123,9 +146,19 @@
         },
         data(){
             return {
-
+                pilHblData:[],
             }
         },
+        methods:{
+            pilHblChange(value){
+                this.$set(this.assemblyForm,'pilHbl',value)
+            },
+            pilHblfun(){
+                getWorkDicts('pilhbl_los').then(res=>{
+                    this.pilHblData = res.data.data
+                })
+            },
+        }
     }
 
 </script>

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

@@ -1098,14 +1098,14 @@
                         name:'MBLNO',
                         value:'mblno',
                     },
-                    {
-                        name:'booking NO',
-                        value:'bookingNo',
-                    },
-                    {
-                        name:'REF MBLNO',
-                        value:'refno',
-                    },
+                    // {
+                    //     name:'booking NO',
+                    //     value:'bookingNo',
+                    // },
+                    // {
+                    //     name:'REF MBLNO',
+                    //     value:'refno',
+                    // },
                     {
                         name:'船名(VSL)',
                         value:'vesselCnName',
@@ -1134,10 +1134,10 @@
                         name:'船公司',
                         value:'carrierCnName',
                     },
-                    {
-                        name:'场站',
-                        value:'cyCnName',
-                    },
+                    // {
+                    //     name:'场站',
+                    //     value:'cyCnName',
+                    // },
                     {
                         name:'所属团队',
                         value:'teamId',
@@ -1416,34 +1416,34 @@
                     obj.corpId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].corpId
                     obj.corpCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].corpCnName
                     obj.corpEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].corpEnName
-                    // 费用简称
-                    obj.feeId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeId
-                    obj.feeCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeCnName
-                    obj.feeEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeEnName
-                    obj.feeCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeCode
-                    // 核算要素
-                    obj.elementsId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsId
-                    obj.elementsCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsCnName
-                    obj.elementsEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsEnName
-                    obj.elementsCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsCode
+                    // // 费用简称
+                    // obj.feeId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeId
+                    // obj.feeCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeCnName
+                    // obj.feeEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeEnName
+                    // obj.feeCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].feeCode
+                    // // 核算要素
+                    // obj.elementsId = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsId
+                    // obj.elementsCnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsCnName
+                    // obj.elementsEnName = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsEnName
+                    // obj.elementsCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].elementsCode
                     // 预付/到付
                     obj.paymode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].paymode
-                    // 计量单位
-                    obj.unitNo = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].unitNo
-                    // 币种
-                    obj.curCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].curCode
-                    obj.taxRate = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].taxRate
-                    // 汇率
-                    obj.exrate = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].exrate
-                    // 单价
-                    obj.price = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].price
-                    // 数量
-                    obj.quantity = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].quantity
-                    // 金额
-                    obj.rmbAmount = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].rmbAmount
-                    obj.usdAmount = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].usdAmount
-                    obj.rmbAmountNet = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].rmbAmountNet
-                    obj.usdAmountNet = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].usdAmountNet
+                    // // 计量单位
+                    // obj.unitNo = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].unitNo
+                    // // 币种
+                    // obj.curCode = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].curCode
+                    // obj.taxRate = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].taxRate
+                    // // 汇率
+                    // obj.exrate = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].exrate
+                    // // 单价
+                    // obj.price = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].price
+                    // // 数量
+                    // obj.quantity = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].quantity
+                    // // 金额
+                    // obj.rmbAmount = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].rmbAmount
+                    // obj.usdAmount = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].usdAmount
+                    // obj.rmbAmountNet = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].rmbAmountNet
+                    // obj.usdAmountNet = this.assemblyForm.feeCenterListD[this.assemblyForm.feeCenterListD.length - 1].usdAmountNet
                 }else {
                     // 往来单位拿主表客户名称
                     obj.corpId = this.assemblyForm.corpId
@@ -1490,34 +1490,34 @@
                     obj.corpId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].corpId
                     obj.corpCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].corpCnName
                     obj.corpEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].corpEnName
-                    // 费用简称
-                    obj.feeId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeId
-                    obj.feeCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeCnName
-                    obj.feeEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeEnName
-                    obj.feeCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeCode
-                    // 核算要素
-                    obj.elementsId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsId
-                    obj.elementsCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsCnName
-                    obj.elementsEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsEnName
-                    obj.elementsCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsCode
+                    // // 费用简称
+                    // obj.feeId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeId
+                    // obj.feeCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeCnName
+                    // obj.feeEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeEnName
+                    // obj.feeCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].feeCode
+                    // // 核算要素
+                    // obj.elementsId = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsId
+                    // obj.elementsCnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsCnName
+                    // obj.elementsEnName = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsEnName
+                    // obj.elementsCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].elementsCode
                     // 预付/到付
                     obj.paymode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].paymode
-                    // 计量单位
-                    obj.unitNo = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].unitNo
-                    // 币种
-                    obj.curCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].curCode
-                    obj.taxRate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].taxRate
-                    // 汇率
-                    obj.exrate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].exrate
-                    // 单价
-                    obj.price = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].price
-                    // 数量
-                    obj.quantity = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].quantity
-                    // 金额
-                    obj.rmbAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmount
-                    obj.usdAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmount
-                    obj.rmbAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmountNet
-                    obj.usdAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmountNet
+                    // // 计量单位
+                    // obj.unitNo = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].unitNo
+                    // // 币种
+                    // obj.curCode = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].curCode
+                    // obj.taxRate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].taxRate
+                    // // 汇率
+                    // obj.exrate = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].exrate
+                    // // 单价
+                    // obj.price = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].price
+                    // // 数量
+                    // obj.quantity = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].quantity
+                    // // 金额
+                    // obj.rmbAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmount
+                    // obj.usdAmount = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmount
+                    // obj.rmbAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].rmbAmountNet
+                    // obj.usdAmountNet = this.assemblyForm.feeCenterListC[this.assemblyForm.feeCenterListC.length - 1].usdAmountNet
                 }else {
                     // 往来单位拿主表客户名称
                     obj.corpId = this.assemblyForm.corpId
@@ -2565,13 +2565,16 @@
             },
             // 关闭弹窗
             handleClose(done) {
-                this.$confirm('确认关闭？')
-                    .then(_ => {
-                        this.feesselectionList = [] // 清空多选
-                        this.templateRightData = [] // 清空数据
-                        done();
-                    })
-                    .catch(_ => {});
+                this.feesselectionList = [] // 清空多选
+                this.templateRightData = [] // 清空数据
+                done();
+                // this.$confirm('确认关闭？')
+                //     .then(_ => {
+                //         this.feesselectionList = [] // 清空多选
+                //         this.templateRightData = [] // 清空数据
+                //         done();
+                //     })
+                //     .catch(_ => {});
             },
             //自定义列保存
             async saveColumnTwo(ref, option, optionBack, code) {

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

@@ -164,7 +164,7 @@
                                       :remote="true"
                                       :disabled="detailData.seeDisabled"
                                       :buttonIf="false"
-                                      :forParameter="{key:'dictKey',label:'dictValue',value:'dictValue',}"
+                                      :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey',}"
                                       placeholder="请选择签单方式"
                                       @remoteMethod="remoteMethod($event,'issueType')"
                                       @corpChange="corpChange($event,'issueType')"

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

@@ -380,6 +380,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     cargoType:'dry', // 货物类型默认普货
                     marks:'N/M',
                     dgPackingLevel:'0', // 危险品包装等级
+                    serviceTerms:'CY to CY', // 服务方式
                     filesList:[], // 文件中心
                     feeCenterListD:[], // 收
                     feeCenterListC:[], // 付
@@ -1375,7 +1376,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                             if (!item.feeId) {
                                 sum += ` 应收序号${item.$index + 1}费用简称`
                             }
-                            if (!item.elementsCode) {
+                            if (!item.elementsId) {
                                 sum += ` 应收序号${item.$index + 1}核算要素`
                             }
                             if (!item.curCode) {
@@ -1389,7 +1390,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                             if (!item.feeId) {
                                 sum += ` 应付序号${item.$index + 1}费用简称`
                             }
-                            if (!item.elementsCode) {
+                            if (!item.elementsId) {
                                 sum += ` 应付序号${item.$index + 1}核算要素`
                             }
                             if (!item.curCode) {

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

@@ -701,6 +701,15 @@ import { getDeptTree } from "@/api/system/dept";
               searchOrder:5,
             },
             {
+                label: "booking NO",
+                prop: "bookingNo",
+                width: "120",
+                overHidden: true,
+                search:true,
+                span:6,
+                searchOrder:5,
+            },
+            {
               label: "开船日期",
               prop: "etd",
               searchProp:"etdList",

src/views/iosBasicData/UnpaidPaymentsDetails/index.vue

@@ -386,15 +386,15 @@ export default {
             if (name == 'corpName') {
                 for (let item of this.corpIdData) {
                     if (item.cnName == value) {
-                        this.$set(this.query,'corpId',item.corpId)
-                        this.$set(this.query,'corpName',item.corpName)
+                        this.$set(this.query,'corpId',item.id)
+                        this.$set(this.query,'corpName',item.cnName)
                     }
                 }
             } else if (name == 'clientName') {
                 for (let item of this.clientIdData) {
                     if (item.cnName == value) {
-                        this.$set(this.query,'clientId',item.corpId)
-                        this.$set(this.query,'clientName',item.corpName)
+                        this.$set(this.query,'clientId',item.id)
+                        this.$set(this.query,'clientName',item.cnName)
                     }
                 }
             }else if (name == 'srcName') {
@@ -500,9 +500,8 @@ export default {
         },
         // 搜索
         searchChange(params, done) {
-            this.query = params;
             this.page.currentPage = 1;
-            this.onLoad(this.page, params);
+            this.onLoad(this.page, this.query);
             done();
         },
         currentChange(currentPage){
@@ -551,6 +550,13 @@ export default {
             if (inSave) {
                 this.$message.success("重置成功");
                 this.$refs[ref].$refs.dialogColumn.columnBox = false;
+                this.query = {
+                    dc:'D',
+                    isBusinessDate:1,
+                    isToExamineDate:0,
+                    etdStart:defaultDate3()[0],
+                    etdEnd:defaultDate3()[1],
+                }
             }
         },
         // 更改表格颜色

src/views/iosBasicData/VoucherTemplates/index.vue

@@ -511,11 +511,12 @@
             },
             // 类别弹窗关闭
             corpTypeClose(done) {
-                this.$confirm('确认关闭？')
-                    .then(_ => {
-                        done();
-                    })
-                    .catch(_ => { });
+                done();
+                // this.$confirm('确认关闭？')
+                //     .then(_ => {
+                //         done();
+                //     })
+                //     .catch(_ => { });
             },
             //自定义列保存
             async saveColumnTwo(ref, option, optionBack, code) {

src/views/iosBasicData/accounts/index.vue

@@ -552,11 +552,12 @@ import {
         },
       // 弹窗点击差号
       handleClose(done) {
-          this.$confirm('确认关闭？')
-              .then(_ => {
-                  done();
-              })
-              .catch(_ => {});
+          done();
+          // this.$confirm('确认关闭？')
+          //     .then(_ => {
+          //         done();
+          //     })
+          //     .catch(_ => {});
       },
         // 添加
       rowSave(row, done, loading) {

src/views/iosBasicData/baccitemstype/baccitems.vue

@@ -307,11 +307,12 @@ export default {
         },
         // 科目列表关闭
         accItemsClose(done){
-            this.$confirm('确认关闭？')
-                .then(_ => {
-                    done();
-                })
-                .catch(_ => {});
+            done();
+            // this.$confirm('确认关闭？')
+            //     .then(_ => {
+            //         done();
+            //     })
+            //     .catch(_ => {});
         },
         //返回列表
         backToList() {

src/views/iosBasicData/bcntrtypes/index.vue

@@ -509,11 +509,12 @@ export default {
     },
     // 扩展数据弹窗关闭
     handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => { });
+        done();
+      // this.$confirm('确认关闭？')
+      //   .then(_ => {
+      //     done();
+      //   })
+      //   .catch(_ => { });
     },
     // 扩展数据添加
     extendedDataAdd() {

src/views/iosBasicData/bcorps/index.vue

@@ -38,9 +38,9 @@
               </template>
 
             <template slot="menuLeft">
-              <el-button type="warning" size="small" icon="el-icon-printer" @click="excelBox = true">导入
-              </el-button>
+              <el-button type="warning" size="small" icon="el-icon-printer" @click="excelBox = true">导入</el-button>
               <el-button type="success" size="small" @click="handleExport" icon="el-icon-printer">导出</el-button>
+              <!--<el-button type="primary" size="small" icon="el-icon-turn-off" @click="Deactivatefun" >批量停用</el-button>-->
               <!--<el-button type="success" size="small" @click="handleReportDesigner" icon="el-icon-printer">设计报表</el-button>-->
               <!--<el-button type="success" size="small" @click="handleReportPreview" icon="el-icon-printer">预览报表</el-button>-->
             </template>
@@ -470,6 +470,17 @@ export default {
       this.$store.commit("DOMIO_OUT_CUL");
   },
   methods: {
+      // 批量停用
+      Deactivatefun(){
+          if (this.selectionList.length == 0) {
+              this.$message.warning("请选择至少一条数据");
+              return;
+          }
+          const arrIds = this.selectionList.map(item=>{
+              return item.id
+          })
+          console.log(arrIds,482)
+      },
       // 获取国家数据
       bcountrysListfun(){
           bcountrysList(1,10).then(res=>{

src/views/iosBasicData/bfeesdefine/index.vue

@@ -747,11 +747,12 @@ export default {
     },
     // 类别弹窗关闭
     corpTypeClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => { });
+        done();
+      // this.$confirm('确认关闭？')
+      //   .then(_ => {
+      //     done();
+      //   })
+      //   .catch(_ => { });
     },
 
     //自定义列保存

src/views/iosBasicData/blines/index.vue

@@ -427,11 +427,12 @@ export default {
     },
     // 扩展数据弹窗关闭
     handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => { });
+        done();
+      // this.$confirm('确认关闭？')
+      //   .then(_ => {
+      //     done();
+      //   })
+      //   .catch(_ => { });
     },
     // 扩展数据添加
     extendedDataAdd() {

src/views/iosBasicData/bpackages/index.vue

@@ -433,11 +433,12 @@ export default {
     },
     // 扩展数据弹窗关闭
     handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => { });
+        done();
+      // this.$confirm('确认关闭？')
+      //   .then(_ => {
+      //     done();
+      //   })
+      //   .catch(_ => { });
     },
       // 扩展数据的确认
       extendedDatafun(){

src/views/iosBasicData/bports/portsTerms.vue

@@ -481,11 +481,12 @@ import {getBservicetermsList} from "@/api/iosBasicData/bserviceterms";
             },
             // 船公司关闭
             shipClose(done){
-                this.$confirm('确认关闭？')
-                    .then(_ => {
-                        done();
-                    })
-                    .catch(_ => {});
+                done();
+                // this.$confirm('确认关闭？')
+                //     .then(_ => {
+                //         done();
+                //     })
+                //     .catch(_ => {});
             },
             // 扩展数据添加
             extendedDataAdd(){

src/views/iosBasicData/bserviceterms/index.vue

@@ -408,11 +408,12 @@ export default {
     },
     // 扩展数据弹窗关闭
     handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => { });
+        done();
+      // this.$confirm('确认关闭？')
+      //   .then(_ => {
+      //     done();
+      //   })
+      //   .catch(_ => { });
     },
       // 扩展数据的确认
       extendedDatafun(){

src/views/iosBasicData/bvessels/index.vue

@@ -554,11 +554,12 @@ export default {
     },
     // 扩展数据弹窗关闭
     handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => { });
+        done();
+      // this.$confirm('确认关闭？')
+      //   .then(_ => {
+      //     done();
+      //   })
+      //   .catch(_ => { });
     },
       // 扩展数据的确认
       extendedDatafun(){

src/views/iosBasicData/financeProfit/index.vue

@@ -799,6 +799,12 @@
                 if (inSave) {
                     this.$message.success("重置成功");
                     this.$refs[ref].$refs.dialogColumn.columnBox = false;
+                    this.query = {
+                        billType:'SE,SI',
+                        costMerge:1,
+                        statisticsDateStart:defaultDate3()[0],
+                        statisticsDateEnd:defaultDate3()[1],
+                    }
                 }
             },
             // 更改表格颜色

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -720,11 +720,12 @@ export default {
         },
         // 费用详细关闭
         feestemplateClose(done){
-            this.$confirm('确认关闭？')
-                .then(_ => {
-                    done();
-                })
-                .catch(_ => {});
+            done();
+            // this.$confirm('确认关闭？')
+            //     .then(_ => {
+            //         done();
+            //     })
+            //     .catch(_ => {});
         },
         //返回列表
         backToList() {

src/views/iosBasicData/losbfeestemplate/index.vue

@@ -645,11 +645,12 @@ export default {
     },
     // 类别弹窗关闭
     corpTypeClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => { });
+        done();
+      // this.$confirm('确认关闭？')
+      //   .then(_ => {
+      //     done();
+      //   })
+      //   .catch(_ => { });
     },
     //自定义列保存
     async saveColumnTwo(ref, option, optionBack, code) {

src/views/iosBasicData/paymentDetail/index.vue

@@ -449,15 +449,15 @@ export default {
             }else if (name == 'corpName') {
                 for (let item of this.corpIdData) {
                     if (item.cnName == value) {
-                        this.$set(this.query,'corpId',item.corpId)
-                        this.$set(this.query,'corpName',item.corpName)
+                        this.$set(this.query,'corpId',item.id)
+                        this.$set(this.query,'corpName',item.cnName)
                     }
                 }
             } else if (name == 'clientName') {
                 for (let item of this.clientIdData) {
                     if (item.cnName == value) {
-                        this.$set(this.query,'clientId',item.corpId)
-                        this.$set(this.query,'clientName',item.corpName)
+                        this.$set(this.query,'clientId',item.id)
+                        this.$set(this.query,'clientName',item.cnName)
                     }
                 }
             }else if (name == 'srcType') {
@@ -610,9 +610,8 @@ export default {
         },
         // 搜索
         searchChange(params, done) {
-            this.query = params;
             this.page.currentPage = 1;
-            this.onLoad(this.page, params);
+            this.onLoad(this.page, this.query);
             done();
         },
         currentChange(currentPage){
@@ -661,6 +660,14 @@ export default {
             if (inSave) {
                 this.$message.success("重置成功");
                 this.$refs[ref].$refs.dialogColumn.columnBox = false;
+                this.query = {
+                    dc:'D',
+                    isBusinessDate:1,
+                    isToExamineDate:0,
+                    type:'1',
+                    etdStart:defaultDate3()[0],
+                    etdEnd:defaultDate3()[1],
+                }
             }
         },
         // 更改表格颜色

src/views/iosBasicData/paymentSummary/index.vue

@@ -410,15 +410,15 @@
                 }else if (name == 'corpName') {
                     for (let item of this.corpIdData) {
                         if (item.cnName == value) {
-                            this.$set(this.query,'corpId',item.corpId)
-                            this.$set(this.query,'corpName',item.corpName)
+                            this.$set(this.query,'corpId',item.id)
+                            this.$set(this.query,'corpName',item.cnName)
                         }
                     }
                 } else if (name == 'clientName') {
                     for (let item of this.clientIdData) {
                         if (item.cnName == value) {
-                            this.$set(this.query,'clientId',item.corpId)
-                            this.$set(this.query,'clientName',item.corpName)
+                            this.$set(this.query,'clientId',item.id)
+                            this.$set(this.query,'clientName',item.cnName)
                         }
                     }
                 }else if (name == 'srcType') {
@@ -571,9 +571,8 @@
             },
             // 搜索
             searchChange(params, done) {
-                this.query = params;
                 this.page.currentPage = 1;
-                this.onLoad(this.page, params);
+                this.onLoad(this.page, this.query);
                 done();
             },
             currentChange(currentPage){
@@ -626,6 +625,14 @@
                 if (inSave) {
                     this.$message.success("重置成功");
                     this.$refs[ref].$refs.dialogColumn.columnBox = false;
+                    this.query = {
+                        dc:'D',
+                        isBusinessDate:1,
+                        isToExamineDate:0,
+                        type:'1',
+                        etdStart:defaultDate3()[0],
+                        etdEnd:defaultDate3()[1],
+                    }
                 }
             },
             // 更改表格颜色

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

@@ -142,13 +142,13 @@
 import { option2, option3 } from "./js/optionList";
 // import {getDetails, addCorpType, getCorpType, submit, customerList, itemDel} from "@/api/basicData/client";
 import {
-  getDetails,
-  getCorpType,
-  submit,
-  customerList,
-  itemDel,
-  corpsattn,
-  editenable
+    getDetails,
+    getCorpType,
+    submit,
+    customerList,
+    itemDel,
+    corpsattn,
+    editenable, getUserByRole
 } from "@/api/tirePartsMall/basicData/customerInformation"
 import corpType from './components/index'
 import { creatingUsersTwo } from "@/api/basicData/customerInformation";
@@ -433,13 +433,23 @@ export default {
               label: "name",
               value: "id"
             },
+            dicData:[],
             dicUrl: "/api/blade-user/client/getUserByRole",
             filterable: true,
             rules: [{
               required: true,
               message: " ",
               trigger: "blur"
-            }]
+            }],
+              change:(value)=>{
+                if (value.value) {
+                    for (let item of value.column.dicData) {
+                        if (item.id == value.value) {
+                            this.$set(this.form,'salesmanName',item.name)
+                        }
+                    }
+                }
+              }
           },
           {
             label: "账期",
@@ -624,6 +634,7 @@ export default {
     } else {
       this.initData();
     }
+    this.getUserByRolefun()
     this.getCorpType()
     this.getAllWorkDicts()
     this.getCorpTypeCk()
@@ -636,6 +647,12 @@ export default {
     }, 100)
   },
   methods: {
+      // 获取业务员数据
+      getUserByRolefun(){
+          getUserByRole().then(res=>{
+              this.findObject(this.option.column, "salesmanId").dicData = res.data;
+          })
+      },
       // 额度弹窗确认
     limitrecordSubmitfun(){
         if (this.$refs.limitrecord.tabData == 'XGED') {

src/views/tirePartsMall/inventory/index.vue

@@ -59,7 +59,7 @@ export default {
       treeData: [],
       loading: false,
       corpTypeVisible: false,
-      search: {whether:'0',ifGrounding:'0'},
+      search: {whether:'0',ifGrounding:'1'},
       form: {},
       dataList: [],
       stockSum:{}, // 合计数据

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

@@ -40,14 +40,13 @@
                         </el-dropdown-item>
                         <el-dropdown-item @click.native="checkScheduleDialog = true, checkId = form.id">审核进度
                         </el-dropdown-item>
-
                     </el-dropdown-menu>
                 </el-dropdown>
-                <el-button class="el-button&#45;&#45;small-yh" style="margin-left: 6px;" v-if="form.id"
-                           type="success" size="small"
-                           :disabled="form.shortcutWarehousingStatus == '1' || form.status != '录入' || editButton"
-                           @click="oneClickStorage" >一键采购入库
-                </el-button>
+                <!--<el-button class="el-button&#45;&#45;small-yh" style="margin-left: 6px;" v-if="form.id"-->
+                <!--           type="success" size="small"-->
+                <!--           :disabled="form.shortcutWarehousingStatus == '1' || form.status != '录入' || editButton"-->
+                <!--           @click="oneClickStorage" >一键采购入库-->
+                <!--</el-button>-->
             </div>
         </div>
         <div style="margin-top: 50px">