君海尾款 轮胎收款结算 博瑞科生产管理 货代报关 进出口 空运 导入模板

src/components/bill/selectOrderDetailList.vue

@@ -29,7 +29,8 @@
       </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'" :disabled="goodsListSave.findIndex(item => item.id == scope.row.id) !== -1">选择
+          v-if="activeName == 'searchList'"
+          :disabled="goodsListSave.findIndex(item => item.id == scope.row.id) !== -1">选择
         </el-button>
         <el-button type="text" icon="el-icon-delete" size="small" @click.stop="removeStagList(scope.row, scope.index)"
           v-else>移除
@@ -231,7 +232,9 @@ export default {
         params.type = "CMY"
       }
       params.flag = this.flag
-      if (this.params.bsType == 'XS,TKXS') {
+      if (this.params.bsType == 'XS,TKXS,GX') {
+        params.settlementType = 'd'
+      } else if (this.params.bsType == 'XS,TKXS') {
         params.settlementType = 'd'
       } else {
         params.settlementType = 'c'

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

@@ -97,7 +97,7 @@
                                 </el-col>
                                 <el-col :span="7">
                                     <span style="padding-left: 20px"></span>
-                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.departureNamePrint"
+                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.departureCnName"
                                         size="small" autocomplete="off"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" clearable
                                         placeholder="请输入起运港"></el-input>
@@ -124,7 +124,7 @@
                                 <el-col :span="7">
                                     <span style="padding-left: 20px"></span>
                                     <el-input type="age" style="width: 100%;"
-                                        v-model="assemblyForm.departureAddrNamePrint" size="small" autocomplete="off"
+                                        v-model="assemblyForm.departureAddrCnName" size="small" autocomplete="off"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" clearable
                                         placeholder="起运地"></el-input>
                                 </el-col>
@@ -249,14 +249,14 @@
                         <!--                  @corpFocus="remoteMethod($event,'createUserName')" >-->
                         <!--    </search-query>-->
                         <!--</el-form-item>-->
-                        <el-form-item label="出口代理" prop="voyageNo" label-width="80px">
+                        <el-form-item label="订舱代理" prop="voyageNo" label-width="80px">
                             <span slot="label">
-                                <span style="color: #1e9fff">出口代理</span>
+                                <span style="color: #1e9fff">订舱代理</span>
                             </span>
                             <search-query :datalist="bookingAgentData" :selectValue="assemblyForm.bookingAgentCnName"
                                 :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
                                 :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
-                                placeholde="请选择出口代理" @remoteMethod="remoteMethod($event, 'bookingAgent')"
+                                placeholde="请选择订舱代理" @remoteMethod="remoteMethod($event, 'bookingAgent')"
                                 @corpChange="corpChange($event, 'bookingAgent')"
                                 @corpFocus="remoteMethod($event, 'bookingAgent')">
                             </search-query>
@@ -912,7 +912,6 @@ export default {
                     this.$set(this.assemblyForm, name + 'CnName', '')
                     this.$set(this.assemblyForm, name + 'EnName', '')
                     this.$set(this.assemblyForm, name + 'Code', '')
-                    this.$set(this.assemblyForm, name + 'NamePrint', '')
                 }
                 for (let item of this[name + 'Data']) {
                     if (item.enName == value) {
@@ -920,7 +919,6 @@ export default {
                         this.$set(this.assemblyForm, name + 'CnName', item.cnName)
                         this.$set(this.assemblyForm, name + 'EnName', item.enName)
                         this.$set(this.assemblyForm, name + 'Code', item.code)
-                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName)
                     }
                 }
             }
@@ -930,14 +928,14 @@ export default {
                     this.$set(this.assemblyForm, name + 'Id', '')
                     this.$set(this.assemblyForm, name + 'Name', '')
                     this.$set(this.assemblyForm, name + 'Code', '')
-                    this.$set(this.assemblyForm, name + 'NamePrint', '')
+                    this.$set(this.assemblyForm, name + 'EnName', '')
                 }
                 for (let item of this[name + 'Data']) {
                     if (item.enName == value) {
                         this.$set(this.assemblyForm, name + 'Id', item.id)
                         this.$set(this.assemblyForm, name + 'Name', item.enName)
                         this.$set(this.assemblyForm, name + 'Code', item.code)
-                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName)
+                        this.$set(this.assemblyForm, name + 'EnName', item.enName)
                     }
                 }
             }

src/views/iosBasicData/AirtransportExport/bills/assembly/mbinformation.vue

@@ -319,11 +319,11 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="预付总额" prop="hPayAmount">
+                    <el-form-item label="预付总额" prop="hpayAmount">
                         <span slot="label">
                             <span style="color: #1e9fff">预付总额</span>
                         </span>
-                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.hPayAmount" size="small"
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.hpayAmount" size="small"
                             autocomplete="off" :disabled="detailData.seeDisabled" clearable
                             placeholder="请输入预付总额"></el-input>
                     </el-form-item>

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

@@ -540,7 +540,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 6,
+                searchMenuSpan: 24,
                 searchLabelWidth: '100',
                 border: true,
                 index: true,
@@ -616,24 +616,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "船名",
-                        prop: "vesselCnName",
-                        overHidden: true,
-                        type: 'select',
-                        dicData: [],
-                        filterable: true,
-                        remote: true,
-                        dicUrl: "/api/blade-los/bvessels/list?cnName={{key}}",
-                        props: {
-                            label: 'cnName',
-                            value: 'cnName',
-                            res: 'data.records'
-                        },
-                        search: true,
-                        span: 6,
-                        searchOrder: 6,
-                    },
-                    {
                         label: "航班号",
                         prop: "voyageNo",
                         width: "80",
@@ -661,7 +643,7 @@ export default {
                         searchOrder: 5,
                     },
                     {
-                        label: "开船日期",
+                        label: "航班日期",
                         prop: "etd",
                         searchProp: "etdList",
                         type: "date",
@@ -676,7 +658,7 @@ export default {
                         searchOrder: 14,
                     },
                     {
-                        label: "到港日期",
+                        label: "ETA",
                         prop: "eta",
                         width: "80",
                         overHidden: true,
@@ -709,14 +691,14 @@ export default {
                         searchOrder: 8,
                     },
                     {
-                        label: "装货港",
-                        prop: "polEnName",
+                        label: "起运港",
+                        prop: "departureEnName",
                         width: "120",
                         overHidden: true,
                     },
                     {
                         label: "目的港",
-                        prop: "podEnName",
+                        prop: "finalDestinationName",
                         width: "120",
                         overHidden: true,
                         type: 'select',
@@ -734,26 +716,7 @@ export default {
                         searchOrder: 9,
                     },
                     {
-                        label: "航线",
-                        prop: "lineCnName",
-                        width: "120",
-                        overHidden: true,
-                        type: 'select',
-                        dicData: [],
-                        filterable: true,
-                        remote: true,
-                        dicUrl: "/api/blade-los/blines/list?cnName={{key}}",
-                        props: {
-                            label: 'cnName',
-                            value: 'cnName',
-                            res: 'data.records'
-                        },
-                        search: true,
-                        span: 6,
-                        searchOrder: 10,
-                    },
-                    {
-                        label: "场站",
+                        label: "航站",
                         prop: "cyCnName",
                         width: "120",
                         overHidden: true,
@@ -772,12 +735,6 @@ export default {
                         searchOrder: 11,
                     },
                     {
-                        label: "箱型/箱量",
-                        prop: "quantityCntrDescr",
-                        width: "120",
-                        overHidden: true,
-                    },
-                    {
                         label: "业务来源",
                         prop: "srcType",
                         type: 'select',
@@ -810,35 +767,6 @@ export default {
                         searchOrder: 13,
                     },
                     {
-                        label: "装箱方式",
-                        prop: "loadType",
-                        type: 'select',
-                        dicData: [{
-                            label: '整箱',
-                            value: 'FCL'
-                        }, {
-                            label: '拼箱',
-                            value: 'LCL'
-                        }],
-                        overHidden: true,
-                    },
-                    {
-                        label: "货物类别",
-                        prop: "cargoType",
-                        type: 'select',
-                        dicData: [{
-                            label: '普货',
-                            value: 'dry'
-                        }, {
-                            label: '危险品',
-                            value: 'danger'
-                        }, {
-                            label: '冻柜',
-                            value: 'reefer'
-                        }],
-                        overHidden: true,
-                    },
-                    {
                         label: "创建部门",
                         prop: "createDeptName",
                         width: "120",
@@ -876,7 +804,7 @@ export default {
                     },
                     {
                         label: "收货人",
-                        prop: "hConsigneeCnName",
+                        prop: "hconsigneeCnName",
                         width: "120",
                         overHidden: true,
                         type: 'select',
@@ -894,22 +822,6 @@ export default {
                         searchOrder: 18,
                     },
                     {
-                        label: "签单方式",
-                        prop: "issueType",
-                        width: "120",
-                        overHidden: true,
-                        type: 'select',
-                        dicData: [],
-                        dicUrl: "/api/blade-system/dict-biz/dictionary",
-                        props: {
-                            label: 'dictValue',
-                            value: 'dictValue',
-                        },
-                        search: true,
-                        span: 6,
-                        searchOrder: 17,
-                    },
-                    {
                         label: "唛头",
                         prop: "marks",
                         width: "80",
@@ -927,12 +839,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "净重 (KGM)",
-                        prop: "netWeight",
-                        width: "120",
-                        overHidden: true,
-                    },
-                    {
                         label: "体积 (CBM)",
                         prop: "measurement",
                         width: "120",
@@ -1090,22 +996,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "edi发送状态",
-                        prop: "ediStatus",
-                        type: "select",
-                        dicData: [
-                            {
-                                label: '未发送',
-                                value: '0'
-                            }, {
-                                label: '已发送',
-                                value: '1'
-                            }
-                        ],
-                        width: "100",
-                        overHidden: true,
-                    },
-                    {
                         label: "业务状态",
                         prop: "billStatus",
                         type: "select",

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

@@ -97,7 +97,7 @@
                                 </el-col>
                                 <el-col :span="7">
                                     <span style="padding-left: 20px"></span>
-                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.departureNamePrint"
+                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.departureCnName"
                                         size="small" autocomplete="off"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" clearable
                                         placeholder="请输入起运港"></el-input>
@@ -123,7 +123,7 @@
                                 <el-col :span="7">
                                     <span style="padding-left: 20px"></span>
                                     <el-input type="age" style="width: 100%;"
-                                        v-model="assemblyForm.departureAddrNamePrint" size="small" autocomplete="off"
+                                        v-model="assemblyForm.departureAddrCnName" size="small" autocomplete="off"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" clearable
                                         placeholder="请输入起运地"></el-input>
                                 </el-col>
@@ -250,14 +250,14 @@
                                 value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择出库日期">
                             </el-date-picker>
                         </el-form-item>
-                        <el-form-item label="出口代理" prop="voyageNo" label-width="80px">
+                        <el-form-item label="订舱代理" prop="voyageNo" label-width="80px">
                             <span slot="label">
-                                <span style="color: #1e9fff">出口代理</span>
+                                <span style="color: #1e9fff">订舱代理</span>
                             </span>
                             <search-query :datalist="bookingAgentData" :selectValue="assemblyForm.bookingAgentCnName"
                                 :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
                                 :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
-                                placeholder="请选择出口代理" @remoteMethod="remoteMethod($event, 'bookingAgent')"
+                                placeholder="请选择订舱代理" @remoteMethod="remoteMethod($event, 'bookingAgent')"
                                 @corpChange="corpChange($event, 'bookingAgent')"
                                 @corpFocus="remoteMethod($event, 'bookingAgent')">
                             </search-query>
@@ -914,7 +914,6 @@ export default {
                     this.$set(this.assemblyForm, name + 'CnName', '')
                     this.$set(this.assemblyForm, name + 'EnName', '')
                     this.$set(this.assemblyForm, name + 'Code', '')
-                    this.$set(this.assemblyForm, name + 'NamePrint', '')
                 }
                 for (let item of this[name + 'Data']) {
                     if (item.enName == value) {
@@ -922,7 +921,6 @@ export default {
                         this.$set(this.assemblyForm, name + 'CnName', item.cnName)
                         this.$set(this.assemblyForm, name + 'EnName', item.enName)
                         this.$set(this.assemblyForm, name + 'Code', item.code)
-                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName)
                     }
                 }
             }
@@ -932,14 +930,14 @@ export default {
                     this.$set(this.assemblyForm, name + 'Id', '')
                     this.$set(this.assemblyForm, name + 'Name', '')
                     this.$set(this.assemblyForm, name + 'Code', '')
-                    this.$set(this.assemblyForm, name + 'NamePrint', '')
+                    this.$set(this.assemblyForm, name + 'EnName', '')
                 }
                 for (let item of this[name + 'Data']) {
                     if (item.enName == value) {
                         this.$set(this.assemblyForm, name + 'Id', item.id)
                         this.$set(this.assemblyForm, name + 'Name', item.enName)
                         this.$set(this.assemblyForm, name + 'Code', item.code)
-                        this.$set(this.assemblyForm, name + 'NamePrint', item.enName)
+                        this.$set(this.assemblyForm, name + 'EnName', item.enName)
                     }
                 }
             }

src/views/iosBasicData/AirtransportImport/bills/assembly/mbinformation.vue

@@ -321,11 +321,11 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="预付总额" prop="hPayAmount">
+                    <el-form-item label="预付总额" prop="hpayAmount">
                         <span slot="label">
                             <span style="color: #1e9fff">预付总额</span>
                         </span>
-                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.hPayAmount" size="small"
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.hpayAmount" size="small"
                             autocomplete="off" :disabled="detailData.seeDisabled" clearable
                             placeholder="请输入预付总额"></el-input>
                     </el-form-item>

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

@@ -597,7 +597,7 @@ import { getDeptTree } from "@/api/system/dept";
               calcHeight: 30,
               tip: false,
               searchShow: true,
-              searchMenuSpan: 6,
+              searchMenuSpan: 24,
               searchLabelWidth:'100',
               border: true,
               index: true,
@@ -614,597 +614,486 @@ import { getDeptTree } from "@/api/system/dept";
               menuWidth:'auto',
               align: 'center',
               column: [
-                  {
-                      label: "单据类型",
-                      prop: "billType",
-                      type: 'select',
-                      search:true,
-                      span:6,
-                      searchOrder:4,
-                      dicData: [{
-                          label: '直单',
-                          value: 'DD'
-                      }, {
-                          label: '主单',
-                          value: 'MM'
-                      },{
-                          label: '分单',
-                          value: 'MH'
-                      }],
-                      overHidden:true,
-                  },
-                  {
-                      label: "单据编号",
-                      prop: "billNo",
-                      width:"160",
-                      overHidden:true,
-                      search:true,
-                      span:6,
-                      searchOrder:3,
-                  },
-                  {
-                      label: "所属团队",
-                      prop: "teamName",
-                      overHidden:true,
-                  },
-                  {
-                      label: "客户名",
-                      prop: "corpCnName",
-                      width:"160",
-                      overHidden:true,
-                      search:true,
-                      type:'select',
-                      dicData:[],
-                      filterable:true,
-                      remote:true,
-                      dicUrl:"/api/blade-los/bcorps/listByType?shortName={{key}}",
-                      props: {
-                          label: 'cnName',
-                          value: 'cnName',
-                          res:'data.records'
-                      },
-                      span:6,
-                      searchOrder:2,
-                  },
-                  {
-                      label: "客户英文",
-                      prop: "corpEnName",
-                      width:"160",
-                      overHidden:true,
-                  },
-                  {
-                      label: "船名",
-                      prop: "vesselCnName",
-                      overHidden:true,
-                      type:'select',
-                      dicData:[],
-                      filterable:true,
-                      remote:true,
-                      dicUrl:"/api/blade-los/bvessels/list?cnName={{key}}",
-                      props: {
-                          label: 'cnName',
-                          value: 'cnName',
-                          res:'data.records'
-                      },
-                      search:true,
-                      span:6,
-                      searchOrder:6,
-                  },
-                  {
-                      label: "航次",
-                      prop: "voyageNo",
-                      width: "80",
-                      overHidden: true,
-                      search:true,
-                      span:6,
-                      searchOrder:6,
-                  },
-                  {
-                      label: "HB/L NO",
-                      prop: "hblno",
-                      width: "80",
-                      overHidden: true,
-                      search:true,
-                      span:6,
-                      searchOrder:5,
-                  },
-                  {
-                      label: "MB/L NO",
-                      prop: "mblno",
-                      width: "80",
-                      overHidden: true,
-                      search:true,
-                      span:6,
-                      searchOrder:1,
-                  },
-                  {
-                      label: "开船日期",
-                      prop: "etd",
-                      searchProp:"etdList",
-                      type: "date",
-                      unlinkPanels: true,
-                      searchRange: true,
-                      overHidden: true,
-                      format: "yyyy-MM-dd",
-                      valueFormat: "yyyy-MM-dd HH:mm:ss",
-                      searchDefaultTime: ["00:00:00", "23:59:59"],
-                      search:true,
-                      span:6,
-                      searchOrder:14,
-                  },
-                  {
-                      label: "到港日期",
-                      prop: "eta",
-                      width: "80",
-                      overHidden: true,
-                      searchProp:"etaList",
-                      type: "date",
-                      unlinkPanels: true,
-                      searchRange: true,
-                      format: "yyyy-MM-dd",
-                      valueFormat: "yyyy-MM-dd HH:mm:ss",
-                      searchDefaultTime: ["00:00:00", "23:59:59"],
-                      search:true,
-                      span:6,
-                      searchOrder:15,
-                  },
-                  {
-                      label: "船公司",
-                      prop: "carrierCnName",
-                      overHidden:true,
-                      type:'select',
-                      dicData:[],
-                      filterable:true,
-                      remote:true,
-                      dicUrl:"/api/blade-los/bcorps/listByType?cnName={{key}}",
-                      props: {
-                          label: 'cnName',
-                          value: 'cnName',
-                          res:'data.records'
-                      },
-                      search:true,
-                      span:6,
-                      searchOrder:8,
-                  },
-                  {
-                      label: "装货港",
-                      prop: "polEnName",
-                      width:"120",
-                      overHidden:true,
-                  },
-                  {
-                      label: "目的港",
-                      prop: "podEnName",
-                      width:"120",
-                      overHidden:true,
-                      type:'select',
-                      dicData:[],
-                      filterable:true,
-                      remote:true,
-                      dicUrl:"/api/blade-los/bports/list?enName={{key}}",
-                      props: {
-                          label: 'enName',
-                          value: 'enName',
-                          res:'data.records'
-                      },
-                      search:true,
-                      span:6,
-                      searchOrder:9,
-                  },
-                  {
-                      label: "航线",
-                      prop: "lineCnName",
-                      width:"120",
-                      overHidden:true,
-                      type:'select',
-                      dicData:[],
-                      filterable:true,
-                      remote:true,
-                      dicUrl:"/api/blade-los/blines/list?cnName={{key}}",
-                      props: {
-                          label: 'cnName',
-                          value: 'cnName',
-                          res:'data.records'
-                      },
-                      search:true,
-                      span:6,
-                      searchOrder:10,
-                  },
-                  {
-                      label: "场站",
-                      prop: "cyCnName",
-                      width:"120",
-                      overHidden:true,
-                      type:'select',
-                      dicData:[],
-                      filterable:true,
-                      remote:true,
-                      dicUrl:"/api/blade-los/bcorps/listByType?cnName={{key}}",
-                      props: {
-                          label: 'cnName',
-                          value: 'cnName',
-                          res:'data.records'
-                      },
-                      search:true,
-                      span:6,
-                      searchOrder:11,
-                  },
-                  {
-              label: "箱型/箱量",
-              prop: "quantityCntrDescr",
-                width:"120",
-                overHidden:true,
-            },
-                  {
-                      label: "业务来源",
-                      prop: "srcType",
-                      type: 'select',
-                      dicData: [
-                          {
-                              label:'公司',
-                              value:'OWN'
-                          },
-                          {
-                              label:'代理',
-                              value:'AGENT'
-                          },
-                          {
-                              label:'业务员',
-                              value:'SALES'
-                          }
-                      ],
-                      overHidden:true,
-                      search:true,
-                      span:6,
-                      searchOrder:12,
-                  },
-                  {
-                      label: "来源详情",
-                      prop: "srcCnName",
-                      width: "80",
-                      overHidden: true,
-                      search:true,
-                      span:6,
-                      searchOrder:13,
-                  },
-                  {
-                      label: "装箱方式",
-                      prop: "loadType",
-                      type: 'select',
-                      dicData: [{
-                          label: '整箱',
-                          value: 'FCL'
-                      }, {
-                          label: '拼箱',
-                          value: 'LCL'
-                      }],
-                      overHidden:true,
-                  },
-                  {
-                      label: "货物类别",
-                      prop: "cargoType",
-                      type: 'select',
-                      dicData: [{
-                          label: '普货',
-                          value: 'dry'
-                      }, {
-                          label: '危险品',
-                          value: 'danger'
-                      },{
-                          label: '冻柜',
-                          value: 'reefer'
-                      }],
-                      overHidden:true,
-                  },
-                  {
-                      label: "创建部门",
-                      prop: "createDeptName",
-                      width:"120",
-                      overHidden:true,
-                      type:'tree',
-                      dicData:[],
-                      dicUrl:"/api/blade-system/dept/tree",
-                      props: {
-                          label: 'title',
-                          value:'title',
-                          children:'children'
-                      },
-                      search:true,
-                      span:6,
-                      searchOrder:16,
-                  },
-                  {
-                      label: "订舱代理",
-                      prop: "bookingAgentCnName",
-                      width:"120",
-                      overHidden:true,
-                      type:'select',
-                      dicData:[],
-                      filterable:true,
-                      remote:true,
-                      dicUrl:"/api/blade-los/bcorps/listByType?cnName={{key}}",
-                      props: {
-                          label: 'cnName',
-                          value: 'cnName',
-                          res:'data.records'
-                      },
-                      search:true,
-                      span:6,
-                      searchOrder:16,
-                  },
-                  {
-                      label: "收货人",
-                      prop: "hConsigneeCnName",
-                      width:"120",
-                      overHidden:true,
-                      type:'select',
-                      dicData:[],
-                    //   filterable:true,
-                      remote:true,
-                      dicUrl:"/api/blade-los/bcorps/listByType?cnName={{key}}",
-                      props: {
-                          label: 'cnName',
-                          value: 'cnName',
-                          res:'data.records'
-                      },
-                      search:true,
-                      span:6,
-                      searchOrder:18,
-                  },
-                  {
-                      label: "签单方式",
-                      prop: "issueType",
-                      width:"120",
-                      overHidden:true,
-                      type:'select',
-                      dicData:[],
-                      dicUrl:"/api/blade-system/dict-biz/dictionary",
-                      props: {
-                          label: 'dictValue',
-                          value: 'dictValue',
-                      },
-                      search:true,
-                      span:6,
-                      searchOrder:17,
-                  },
-                  {
-                      label: "唛头",
-                      prop: "marks",
-                      width: "80",
-                      overHidden: true,
-                  },
-                  {
-                      label: "件数",
-                      prop: "quantity",
-                      overHidden:true,
-                  },
-                  {
-                      label: "毛重 (KGM)",
-                      prop: "grossWeight",
-                      width:"120",
-                      overHidden:true,
-                  },
-                  {
-                      label: "净重 (KGM)",
-                      prop: "netWeight",
-                      width:"120",
-                      overHidden:true,
-                  },
-                  {
-                      label: "体积 (CBM)",
-                      prop: "measurement",
-                      width:"120",
-                      overHidden:true,
-                  },
-                  {
-                      label: "需陆运",
-                      prop: "isNeedLand",
-                      type: 'select',
-                      dicData: [{
-                          label: '否',
-                          value: 0
-                      }, {
-                          label: '是',
-                          value: 1
-                      }],
-                      overHidden:true,
-                  },
-                  {
-                      label: "需报关",
-                      prop: "isNeedDeclare",
-                      type: 'select',
-                      dicData: [{
-                          label: '否',
-                          value: 0
-                      }, {
-                          label: '是',
-                          value: 1
-                      }],
-                      overHidden:true,
-                  },
-                  {
-                      label: "需三检",
-                      prop: "isNeedIq",
-                      type: 'select',
-                      dicData: [{
-                          label: '否',
-                          value: 0
-                      }, {
-                          label: '是',
-                          value: 1
-                      }],
-                      overHidden:true,
-                  },
-                  {
-                      label: "应收(CNY)",
-                      prop: "amountDr",
-                      width: "160",
-                      overHidden:true,
-                  },
-                  {
-                      label: "应付(CNY)",
-                      prop: "amountCr",
-                      width: "160",
-                      overHidden:true,
-                  },
-                  {
-                      label: "利润(CNY)",
-                      prop: "amountProfit",
-                      width: "160",
-                      overHidden:true,
-                  },
-                  {
-                      // label: "综合 USD 应付(USD) - 非 USD 外币转换为 USD",
-                      label: "综合应付(USD)",
-                      prop: "amountCrUsd",
-                      width: "120",
-                      overHidden:true,
-                  },
-                  {
-                      label: "综合利润(USD)",
-                      prop: "amountProfitUsd",
-                      width: "120",
-                      overHidden:true,
-                  },
-                  {
-                      label: "合计应收(CNY )",
-                      prop: "amountDrLoc",
-                      width:"160",
-                      overHidden:true,
-                  },
-                  {
-                      label: "合计应付(CNY)",
-                      prop: "amountCrLoc",
-                      width:"160",
-                      overHidden:true,
-                  },
-                  {
-                      label: "合计利润(CNY)",
-                      prop: "amountProfitLoc",
-                      width:"160",
-                      overHidden:true,
-                  },
-                  {
-                      label: "应收对账状态",
-                      prop: "checkDrStatusDescr",
-                      width:"160",
-                      overHidden:true,
-                  },
-                  {
-                      label: "应付对账状态",
-                      prop: "checkCrStatusDescr",
-                      width:"160",
-                      overHidden:true,
-                  },
-                  {
-                      label: "应收结算状态",
-                      prop: "stlDrStatusDescr",
-                      width:"160",
-                      overHidden:true,
-                  },
-                  {
-                      label: "应付结算状态",
-                      prop: "stlCrStatusDescr",
-                      width:"160",
-                      overHidden:true,
-                  },
-                  {
-                      label: "销项发票状态",
-                      prop: "invoiceDrStatusDescr",
-                      width:"160",
-                      overHidden:true,
-                  },
-                  {
-                      label: "进项发票状态",
-                      prop: "invoiceCrStatusDescr",
-                      width:"160",
-                      overHidden:true,
-                  },
-                  {
-                      label: "创建人",
-                      prop: "createUserName",
-                      rules: [{
-                          required: true,
-                          message: "请输入创建人",
-                          trigger: "blur"
-                      }],
-                      overHidden:true,
-                  },
-                  {
-                      label: "创建时间",
-                      prop: "createTime",
-                      width:"160",
-                      overHidden:true,
-                  },
-                  {
-                      label: "更新人",
-                      prop: "updateUserName",
-                      overHidden:true,
-                  },
-                  {
-                      label: "更新时间",
-                      prop: "updateTime",
-                      width:"160",
-                      overHidden:true,
-                  },
-                  {
-                      label: "edi发送状态",
-                      prop: "ediStatus",
-                      type:"select",
-                      dicData: [
-                          {
-                              label: '未发送',
-                              value: '0'
-                          },{
-                              label: '已发送',
-                              value: '1'
-                          }
-                      ],
-                      width: "100",
-                      overHidden:true,
-                  },
-                  {
-                      label: "业务状态",
-                      prop: "billStatus",
-                      type:"select",
-                      dicData: [],
-                      props: {
-                          label: "dictValue",
-                          value: "dictKey"
-                      },
-                      width: "120",
-                      overHidden:true,
-                  },
-                  {
-                      label: "财务状态",
-                      prop: "accountStatus",
-                      type:"select",
-                      dicData: [],
-                      props: {
-                          label: "dictValue",
-                          value: "dictKey"
-                      },
-                      width: "120",
-                      overHidden:true,
-                  },
-                  {
-                      label: "审核状态",
-                      prop: "status",
-                      type: 'select',
-                      dicData: [],
-                      props: {
-                          label: "dictValue",
-                          value: "dictKey"
-                      },
-                      width: "120",
-                      overHidden:true,
-                  },
-                  {
-                      label: "备注",
-                      prop: "remarks",
-                      overHidden:true,
-                  },
-              ]
+                    {
+                        label: "单据类型",
+                        prop: "billType",
+                        type: 'select',
+                        search: true,
+                        span: 6,
+                        searchOrder: 4,
+                        dicData: [{
+                            label: '直单',
+                            value: 'DD'
+                        }, {
+                            label: '主单',
+                            value: 'MM'
+                        }, {
+                            label: '分单',
+                            value: 'MH'
+                        }],
+                        overHidden: true,
+                    },
+                    {
+                        label: "单据编号",
+                        prop: "billNo",
+                        width: "160",
+                        overHidden: true,
+                        search: true,
+                        span: 6,
+                        searchOrder: 3,
+                    },
+                    {
+                        label: "所属团队",
+                        prop: "teamName",
+                        overHidden: true,
+                    },
+                    {
+                        label: "客户名",
+                        prop: "corpCnName",
+                        width: "160",
+                        overHidden: true,
+                        search: true,
+                        type: 'select',
+                        dicData: [],
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bcorps/listByType?shortName={{key}}",
+                        props: {
+                            label: 'cnName',
+                            value: 'cnName',
+                            res: 'data.records'
+                        },
+                        span: 6,
+                        searchOrder: 2,
+                    },
+                    {
+                        label: "客户英文",
+                        prop: "corpEnName",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
+                        label: "航班号",
+                        prop: "voyageNo",
+                        width: "80",
+                        overHidden: true,
+                        search: true,
+                        span: 6,
+                        searchOrder: 6,
+                    },
+                    {
+                        label: "MB/L NO",
+                        prop: "mblno",
+                        width: "80",
+                        overHidden: true,
+                        search: true,
+                        span: 6,
+                        searchOrder: 1,
+                    },
+                    {
+                        label: "HB/L NO",
+                        prop: "hblno",
+                        width: "80",
+                        overHidden: true,
+                        search: true,
+                        span: 6,
+                        searchOrder: 5,
+                    },
+                    {
+                        label: "航班日期",
+                        prop: "etd",
+                        searchProp: "etdList",
+                        type: "date",
+                        unlinkPanels: true,
+                        searchRange: true,
+                        overHidden: true,
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd HH:mm:ss",
+                        searchDefaultTime: ["00:00:00", "23:59:59"],
+                        search: true,
+                        span: 6,
+                        searchOrder: 14,
+                    },
+                    {
+                        label: "ETA",
+                        prop: "eta",
+                        width: "80",
+                        overHidden: true,
+                        searchProp: "etaList",
+                        type: "date",
+                        unlinkPanels: true,
+                        searchRange: true,
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd HH:mm:ss",
+                        searchDefaultTime: ["00:00:00", "23:59:59"],
+                        search: true,
+                        span: 6,
+                        searchOrder: 15,
+                    },
+                    {
+                        label: "航空公司",
+                        prop: "carrierCnName",
+                        overHidden: true,
+                        type: 'select',
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        props: {
+                            label: 'cnName',
+                            value: 'cnName',
+                            res: 'data.records'
+                        },
+                        search: true,
+                        span: 6,
+                        searchOrder: 8,
+                    },
+                    {
+                        label: "起运港",
+                        prop: "departureEnName",
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
+                        label: "目的港",
+                        prop: "finalDestinationName",
+                        width: "120",
+                        overHidden: true,
+                        type: 'select',
+                        dicData: [],
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bports/list?enName={{key}}",
+                        props: {
+                            label: 'enName',
+                            value: 'enName',
+                            res: 'data.records'
+                        },
+                        search: true,
+                        span: 6,
+                        searchOrder: 9,
+                    },
+                    {
+                        label: "航站",
+                        prop: "cyCnName",
+                        width: "120",
+                        overHidden: true,
+                        type: 'select',
+                        dicData: [],
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        props: {
+                            label: 'cnName',
+                            value: 'cnName',
+                            res: 'data.records'
+                        },
+                        search: true,
+                        span: 6,
+                        searchOrder: 11,
+                    },
+                    {
+                        label: "业务来源",
+                        prop: "srcType",
+                        type: 'select',
+                        dicData: [
+                            {
+                                label: '公司',
+                                value: 'OWN'
+                            },
+                            {
+                                label: '代理',
+                                value: 'AGENT'
+                            },
+                            {
+                                label: '业务员',
+                                value: 'SALES'
+                            }
+                        ],
+                        overHidden: true,
+                        search: true,
+                        span: 6,
+                        searchOrder: 12,
+                    },
+                    {
+                        label: "来源详情",
+                        prop: "srcCnName",
+                        width: "80",
+                        overHidden: true,
+                        search: true,
+                        span: 6,
+                        searchOrder: 13,
+                    },
+                    {
+                        label: "创建部门",
+                        prop: "createDeptName",
+                        width: "120",
+                        overHidden: true,
+                        type: 'tree',
+                        dicData: [],
+                        dicUrl: "/api/blade-system/dept/tree",
+                        props: {
+                            label: 'title',
+                            value: 'title',
+                            children: 'children'
+                        },
+                        search: true,
+                        span: 6,
+                        searchOrder: 16,
+                    },
+                    {
+                        label: "订舱代理",
+                        prop: "bookingAgentCnName",
+                        width: "120",
+                        overHidden: true,
+                        type: 'select',
+                        dicData: [],
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        props: {
+                            label: 'cnName',
+                            value: 'cnName',
+                            res: 'data.records'
+                        },
+                        search: true,
+                        span: 6,
+                        searchOrder: 16,
+                    },
+                    {
+                        label: "收货人",
+                        prop: "hconsigneeCnName",
+                        width: "120",
+                        overHidden: true,
+                        type: 'select',
+                        dicData: [],
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        props: {
+                            label: 'cnName',
+                            value: 'cnName',
+                            res: 'data.records'
+                        },
+                        search: true,
+                        span: 6,
+                        searchOrder: 18,
+                    },
+                    {
+                        label: "唛头",
+                        prop: "marks",
+                        width: "80",
+                        overHidden: true,
+                    },
+                    {
+                        label: "件数",
+                        prop: "quantity",
+                        overHidden: true,
+                    },
+                    {
+                        label: "毛重 (KGM)",
+                        prop: "grossWeight",
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
+                        label: "体积 (CBM)",
+                        prop: "measurement",
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
+                        label: "需陆运",
+                        prop: "isNeedLand",
+                        type: 'select',
+                        dicData: [{
+                            label: '否',
+                            value: 0
+                        }, {
+                            label: '是',
+                            value: 1
+                        }],
+                        overHidden: true,
+                    },
+                    {
+                        label: "需报关",
+                        prop: "isNeedDeclare",
+                        type: 'select',
+                        dicData: [{
+                            label: '否',
+                            value: 0
+                        }, {
+                            label: '是',
+                            value: 1
+                        }],
+                        overHidden: true,
+                    },
+                    {
+                        label: "需三检",
+                        prop: "isNeedIq",
+                        type: 'select',
+                        dicData: [{
+                            label: '否',
+                            value: 0
+                        }, {
+                            label: '是',
+                            value: 1
+                        }],
+                        overHidden: true,
+                    },
+                    {
+                        label: "应收(CNY)",
+                        prop: "amountDr",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
+                        label: "应付(CNY)",
+                        prop: "amountCr",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
+                        label: "利润(CNY)",
+                        prop: "amountProfit",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
+                        // label: "综合 USD 应付(USD) - 非 USD 外币转换为 USD",
+                        label: "综合应付(USD)",
+                        prop: "amountCrUsd",
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
+                        label: "综合利润(USD)",
+                        prop: "amountProfitUsd",
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
+                        label: "合计应收(CNY )",
+                        prop: "amountDrLoc",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
+                        label: "合计应付(CNY)",
+                        prop: "amountCrLoc",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
+                        label: "合计利润(CNY)",
+                        prop: "amountProfitLoc",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
+                        label: "应收对账状态",
+                        prop: "checkDrStatusDescr",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
+                        label: "应付对账状态",
+                        prop: "checkCrStatusDescr",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
+                        label: "应收结算状态",
+                        prop: "stlDrStatusDescr",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
+                        label: "应付结算状态",
+                        prop: "stlCrStatusDescr",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
+                        label: "销项发票状态",
+                        prop: "invoiceDrStatusDescr",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
+                        label: "进项发票状态",
+                        prop: "invoiceCrStatusDescr",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
+                        label: "创建人",
+                        prop: "createUserName",
+                        rules: [{
+                            required: true,
+                            message: "请输入创建人",
+                            trigger: "blur"
+                        }],
+                        overHidden: true,
+                    },
+                    {
+                        label: "创建时间",
+                        prop: "createTime",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
+                        label: "更新人",
+                        prop: "updateUserName",
+                        overHidden: true,
+                    },
+                    {
+                        label: "更新时间",
+                        prop: "updateTime",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
+                        label: "业务状态",
+                        prop: "billStatus",
+                        type: "select",
+                        dicData: [],
+                        props: {
+                            label: "dictValue",
+                            value: "dictKey"
+                        },
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
+                        label: "财务状态",
+                        prop: "accountStatus",
+                        type: "select",
+                        dicData: [],
+                        props: {
+                            label: "dictValue",
+                            value: "dictKey"
+                        },
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
+                        label: "审核状态",
+                        prop: "status",
+                        type: 'select',
+                        dicData: [],
+                        props: {
+                            label: "dictValue",
+                            value: "dictKey"
+                        },
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
+                        label: "备注",
+                        prop: "remarks",
+                        overHidden: true,
+                    },
+                ]
           },
           // 弹窗的配置
         mawbOption:{},

src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue

@@ -438,7 +438,7 @@ export default {
             if (row.dc == 'D') {
                 rowStyle = 'color:#8cb24b;'
             } else if (row.dc == 'C') {
-                rowStyle = 'color:#7ebace;'
+                rowStyle = 'color:#F56C6C;'
             }
             if (row.id) {
                 bgStyle = 'background: #f0f9eb;'

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

@@ -795,7 +795,7 @@ export default {
                     data.pageOne = 'Page : 1 of 2'
                     data.pageTwo = 'Page : 2 of 2'
                     var extraLongText = data.commodityDescr.substring(descriptionIndex2 + 2, data.commodityDescr.length)
-                    data.commodityDescr = data.commodityDescr.substring(0, descriptionIndex2)
+                    // data.commodityDescr = data.commodityDescr.substring(0, descriptionIndex2)
                     data.extraLongTips = '** TO BE CONTINUED ON ATTACHED LIST **'
                     data.extraLongText = extraLongText
                 }

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

@@ -765,23 +765,23 @@ export default {
           // }
 
           if (data.commodityDescr) {
-            //   var descriptionIndex2 = data.commodityDescr.indexOf('\n')
-            //   for (let i = 0; i < 19; i++) {
-            //     descriptionIndex2 = data.commodityDescr.indexOf('\n', descriptionIndex2 + 1);
-            //   }
-            //   if (descriptionIndex2 != -1) {
-            //     data.pageOne = 'Page : 1 of 2'
-            //     data.pageTwo = 'Page : 2 of 2'
-            //     var extraLongText = data.commodityDescr.substring(descriptionIndex2 + 2, data.commodityDescr.length)
-            //     data.commodityDescr = data.commodityDescr.substring(0, descriptionIndex2)
-            //     data.extraLongTips = '** TO BE CONTINUED ON ATTACHED LIST **'
-            //     data.extraLongText = extraLongText
-            //   }
-            let arrDeteil = []
-            arrDeteil = data.commodityDescr.split('\n')
-            if (arrDeteil.length > 19) {
-              data.commodityDescr = arrDeteil.slice(0, 19).join('\n')
-            }
+              var descriptionIndex2 = data.commodityDescr.indexOf('\n')
+              for (let i = 0; i < 19; i++) {
+                descriptionIndex2 = data.commodityDescr.indexOf('\n', descriptionIndex2 + 1);
+              }
+              if (descriptionIndex2 != -1) {
+                data.pageOne = 'Page : 1 of 2'
+                data.pageTwo = 'Page : 2 of 2'
+                var extraLongText = data.commodityDescr.substring(descriptionIndex2 + 2, data.commodityDescr.length)
+                // data.commodityDescr = data.commodityDescr.substring(0, descriptionIndex2)
+                data.extraLongTips = '** TO BE CONTINUED ON ATTACHED LIST **'
+                data.extraLongText = extraLongText
+              }
+            // let arrDeteil = []
+            // arrDeteil = data.commodityDescr.split('\n')
+            // if (arrDeteil.length > 18) {
+            //   data.commodityDescr = arrDeteil.slice(0, 18).join('\n')
+            // }
           }
           // console.log(data.hshipperDetails, 'hshipperDetails2')
 

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

@@ -21,7 +21,7 @@
                 </el-button>
                 <el-dropdown style="line-height: 0" v-if="saberTenantId == '409341'">
                     <el-button size="small" type="warning" style="margin-right: 8px"
-                        :disabled="form.status > 0 || showLock">
+                        :disabled="form.status > 0 || showLock || !form.id">
                         导入模板<i class="el-icon-arrow-down el-icon--right"></i>
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
@@ -101,7 +101,7 @@
                                                                 }} {{ item[0].label }}
                                                             </span>
                                                             <span v-else style="color: #1e9fff">{{ item[0].label
-                                                                }}</span>
+                                                            }}</span>
                                                         </span>
                                                         <span v-if="item[0].type == 'button'"></span>
                                                         <!--<el-button v-if="item[0].type == 'button'" :disabled="detailData.seeDisabled || item[0].disabled"-->
@@ -955,13 +955,13 @@ export default {
         //文档导入
         importData(row) {
             if (row == 0) {
-                this.excelOption.column[0].action = '/api/blade-los/templateImport/importOne'
+                this.excelOption.column[0].action = `/api/blade-los/templateImport/importOne?billId=${this.form.id}`
             } else if (row == 1) {
-                this.excelOption.column[0].action = '/api/blade-los/templateImport/importPilBooking'
+                this.excelOption.column[0].action = `/api/blade-los/templateImport/importPilBooking?billId=${this.form.id}`
             } else if (row == 2) {
-                this.excelOption.column[0].action = '/api/blade-los/templateImport/importPilCutOffOrders'
+                this.excelOption.column[0].action = `/api/blade-los/templateImport/importPilCutOffOrders?billId=${this.form.id}`
             } else if (row == 3) {
-                this.excelOption.column[0].action = '/api/blade-los/templateImport/importHisenseBill'
+                this.excelOption.column[0].action = `/api/blade-los/templateImport/importHisenseBill?billId=${this.form.id}`
             }
             this.excelBox = true
         },
@@ -979,8 +979,7 @@ export default {
         },
         // 上传成功
         onSuccess(res, done, loading, column) {
-            //    const obj = Object.assign(res,this.removeEmptyValues(this.form));
-            if (res) {
+            if (Object.keys(res).length) {
                 this.$confirm('此操作将覆盖数据, 是否继续?', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
@@ -1009,14 +1008,13 @@ export default {
                     loading = false;
                     done();
                 }).catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '已取消操作'
-                    });
                     this.excelBox = false;
                     loading = false;
                     done();
                 });
+            } else {
+                loading = false;
+                done();
             }
         },
         // 获取EDI列表数据

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue

@@ -288,7 +288,7 @@ export default {
             if (row.dc == 'D') {
                 rowStyle = 'color:#8cb24b;'
             } else if (row.dc == 'C') {
-                rowStyle = 'color:#7ebace;'
+                rowStyle = 'color:#F56C6C;'
             } else { }
             return rowStyle + 'padding:0px;fontSize:12px'
         },

src/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue

@@ -478,7 +478,7 @@ export default {
             if (row.dc == 'D') {
                 rowStyle = 'color:#8cb24b;'
             } else if (row.dc == 'C') {
-                rowStyle = 'color:#7ebace;'
+                rowStyle = 'color:#F56C6C;'
             } else { }
             return rowStyle + 'padding:0px;fontSize:12px'
         },

src/views/iosBasicData/reportClose/AEreportClose/assembly/feecenter.vue

@@ -138,8 +138,9 @@
                 <template slot="curCode" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="curCodeData" :selectValue="row.curCode" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code' }" @remoteMethod="bcurrencyGetExratefun('D')"
-                        @corpChange="corpChange($event, 'curCode', row, 'D')" @corpFocus="bcurrencyGetExratefun('D')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code' }"
+                        @remoteMethod="bcurrencyGetExratefun('D')" @corpChange="corpChange($event, 'curCode', row, 'D')"
+                        @corpFocus="bcurrencyGetExratefun('D')">
                     </search-query>
                     <span v-else>{{ row.curCode }}</span>
                 </template>
@@ -148,12 +149,12 @@
                 </template>
                 <template slot="price" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.price" size="small" :controls="false" :precision="2"
-                        placeholder="请输入" @blur="priceinputfun($event, row)"></el-input-number>
+                        placeholder="请输入" @blur="priceinputfun($event, row)" style="width: 100%;"></el-input-number>
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1" :controls="false"
-                        :precision="0" placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
+                        :precision="0" placeholder="请输入" @blur="quantityinputfun(row)" style="width: 100%;"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -277,8 +278,9 @@
                 <template slot="curCode" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="curCodeData" :selectValue="row.curCode" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code' }" @remoteMethod="bcurrencyGetExratefun('C')"
-                        @corpChange="corpChange($event, 'curCode', row, 'C')" @corpFocus="bcurrencyGetExratefun('C')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code' }"
+                        @remoteMethod="bcurrencyGetExratefun('C')" @corpChange="corpChange($event, 'curCode', row, 'C')"
+                        @corpFocus="bcurrencyGetExratefun('C')">
                     </search-query>
                     <span v-else>{{ row.curCode }}</span>
                 </template>
@@ -287,12 +289,12 @@
                 </template>
                 <template slot="price" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.price" size="small" :controls="false" :precision="2"
-                        placeholder="请输入" @blur="priceinputfun($event, row)"></el-input-number>
+                        placeholder="请输入" @blur="priceinputfun($event, row)" style="width: 100%;"></el-input-number>
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1" :controls="false"
-                        :precision="0" placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
+                        :precision="0" placeholder="请输入" @blur="quantityinputfun(row)" style="width: 100%;"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -312,19 +314,17 @@
             :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :option="sumOption"
             :data="sumData"></avue-crud>
         <!--有admin 显示，有收和付各一个也显示出来-->
-        <div v-if="roleName.indexOf('admin') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 || roleName.indexOf('应付查看') != -1))"
+        <div v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('利润查看') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 || roleName.indexOf('应付查看') != -1))"
             style="display: flex;align-items: center;justify-content: space-around">
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
-                    <div style="text-align: center">
-                        <div class="weightfont">¥</div>
-                        <div>CNY</div>
-                    </div>
                     <div>
                         <div style="color: #81B337">
                             <span>应收:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountDr }}元</span>
                         </div>
+                    </div>
+                    <div>
                         <div style="color: #6BBCD1">
                             <span>应付:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountCr }}元</span>
@@ -338,15 +338,13 @@
             </div>
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
-                    <div style="text-align: center">
-                        <div class="weightfont">$</div>
-                        <div>USD</div>
-                    </div>
                     <div>
                         <div style="color: #81B337">
                             <span>应收:</span>
                             <span class="weightnum">${{ assemblyForm.amountDrUsd }}元</span>
                         </div>
+                    </div>
+                    <div>
                         <div style="color: #6BBCD1">
                             <span>应付:</span>
                             <span class="weightnum">${{ assemblyForm.amountCrUsd }}元</span>
@@ -360,15 +358,14 @@
             </div>
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
-                    <div style="text-align: center">
-                        <div class="weightfont">¥</div>
-                        <div>CNY合计</div>
-                    </div>
                     <div>
                         <div style="color: #81B337">
                             <span>应收:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountDrLoc }}元</span>
                         </div>
+
+                    </div>
+                    <div>
                         <div style="color: #6BBCD1">
                             <span>应付:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountCrLoc }}元</span>
@@ -1911,7 +1908,7 @@ export default {
                 });
                 return
             }
-            this.$set(row, 'amount', Number(row.price) * Number(row.quantity ? row.quantity : 0))
+            this.$set(row, 'amount', Number(row.price ? row.price : 0) * Number(row.quantity ? row.quantity : 0))
             // 判断是否有币种
             if (!row.curCode) {
                 return;
@@ -1938,7 +1935,7 @@ export default {
                 this.$set(row, 'quantity', 1)
                 return
             }
-            this.$set(row, 'amount', Number(row.price ? row.price : 0) * Number(row.quantity))
+            this.$set(row, 'amount', Number(row.price ? row.price : 0) * Number(row.quantity ? row.quantity : 0))
             // 判断是否有币种
             if (!row.curCode) {
                 return;

src/views/iosBasicData/reportClose/AIreportClose/assembly/feecenter.vue

@@ -138,8 +138,9 @@
                 <template slot="curCode" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="curCodeData" :selectValue="row.curCode" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code' }" @remoteMethod="bcurrencyGetExratefun('D')"
-                        @corpChange="corpChange($event, 'curCode', row, 'D')" @corpFocus="bcurrencyGetExratefun('D')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code' }"
+                        @remoteMethod="bcurrencyGetExratefun('D')" @corpChange="corpChange($event, 'curCode', row, 'D')"
+                        @corpFocus="bcurrencyGetExratefun('D')">
                     </search-query>
                     <span v-else>{{ row.curCode }}</span>
                 </template>
@@ -148,12 +149,12 @@
                 </template>
                 <template slot="price" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.price" size="small" :controls="false" :precision="2"
-                        placeholder="请输入" @blur="priceinputfun($event, row)"></el-input-number>
+                        placeholder="请输入" @blur="priceinputfun($event, row)" style="width: 100%;"></el-input-number>
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1" :controls="false"
-                        :precision="0" placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
+                        :precision="0" placeholder="请输入" @blur="quantityinputfun(row)" style="width: 100%;"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -277,8 +278,9 @@
                 <template slot="curCode" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="curCodeData" :selectValue="row.curCode" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code' }" @remoteMethod="bcurrencyGetExratefun('C')"
-                        @corpChange="corpChange($event, 'curCode', row, 'C')" @corpFocus="bcurrencyGetExratefun('C')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code' }"
+                        @remoteMethod="bcurrencyGetExratefun('C')" @corpChange="corpChange($event, 'curCode', row, 'C')"
+                        @corpFocus="bcurrencyGetExratefun('C')">
                     </search-query>
                     <span v-else>{{ row.curCode }}</span>
                 </template>
@@ -287,12 +289,12 @@
                 </template>
                 <template slot="price" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.price" size="small" :controls="false" :precision="2"
-                        placeholder="请输入" @blur="priceinputfun($event, row)"></el-input-number>
+                        placeholder="请输入" @blur="priceinputfun($event, row)" style="width: 100%;"></el-input-number>
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1" :controls="false"
-                        :precision="0" placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
+                        :precision="0" placeholder="请输入" @blur="quantityinputfun(row)" style="width: 100%;"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -312,19 +314,17 @@
             :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :option="sumOption"
             :data="sumData"></avue-crud>
         <!--有admin 显示，有收和付各一个也显示出来-->
-        <div v-if="roleName.indexOf('admin') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 || roleName.indexOf('应付查看') != -1))"
+        <div v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('利润查看') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 || roleName.indexOf('应付查看') != -1))"
             style="display: flex;align-items: center;justify-content: space-around">
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
-                    <div style="text-align: center">
-                        <div class="weightfont">¥</div>
-                        <div>CNY</div>
-                    </div>
                     <div>
                         <div style="color: #81B337">
                             <span>应收:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountDr }}元</span>
                         </div>
+                    </div>
+                    <div>
                         <div style="color: #6BBCD1">
                             <span>应付:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountCr }}元</span>
@@ -338,15 +338,13 @@
             </div>
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
-                    <div style="text-align: center">
-                        <div class="weightfont">$</div>
-                        <div>USD</div>
-                    </div>
                     <div>
                         <div style="color: #81B337">
                             <span>应收:</span>
                             <span class="weightnum">${{ assemblyForm.amountDrUsd }}元</span>
                         </div>
+                    </div>
+                    <div>
                         <div style="color: #6BBCD1">
                             <span>应付:</span>
                             <span class="weightnum">${{ assemblyForm.amountCrUsd }}元</span>
@@ -360,15 +358,14 @@
             </div>
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
-                    <div style="text-align: center">
-                        <div class="weightfont">¥</div>
-                        <div>CNY合计</div>
-                    </div>
                     <div>
                         <div style="color: #81B337">
                             <span>应收:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountDrLoc }}元</span>
                         </div>
+
+                    </div>
+                    <div>
                         <div style="color: #6BBCD1">
                             <span>应付:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountCrLoc }}元</span>
@@ -1911,7 +1908,7 @@ export default {
                 });
                 return
             }
-            this.$set(row, 'amount', Number(row.price) * Number(row.quantity ? row.quantity : 0))
+            this.$set(row, 'amount', Number(row.price ? row.price : 0) * Number(row.quantity ? row.quantity : 0))
             // 判断是否有币种
             if (!row.curCode) {
                 return;
@@ -1938,7 +1935,7 @@ export default {
                 this.$set(row, 'quantity', 1)
                 return
             }
-            this.$set(row, 'amount', Number(row.price ? row.price : 0) * Number(row.quantity))
+            this.$set(row, 'amount', Number(row.price ? row.price : 0) * Number(row.quantity ? row.quantity : 0))
             // 判断是否有币种
             if (!row.curCode) {
                 return;

src/views/iosBasicData/reportClose/SEreportClose/assembly/feecenter.vue

@@ -149,12 +149,12 @@
                 </template>
                 <template slot="price" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.price" size="small" :controls="false" :precision="2"
-                        placeholder="请输入" @blur="priceinputfun($event, row)"></el-input-number>
+                        placeholder="请输入" @blur="priceinputfun($event, row)" style="width: 100%;"></el-input-number>
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1" :controls="false"
-                        :precision="0" placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
+                        :precision="0" placeholder="请输入" @blur="quantityinputfun(row)" style="width: 100%;"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -289,12 +289,12 @@
                 </template>
                 <template slot="price" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.price" size="small" :controls="false" :precision="2"
-                        placeholder="请输入" @blur="priceinputfun($event, row)"></el-input-number>
+                        placeholder="请输入" @blur="priceinputfun($event, row)" style="width: 100%;"></el-input-number>
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1" :controls="false"
-                        :precision="0" placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
+                        :precision="0" placeholder="请输入" @blur="quantityinputfun(row)" style="width: 100%;"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -314,19 +314,17 @@
             :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :option="sumOption"
             :data="sumData"></avue-crud>
         <!--有admin 显示，有收和付各一个也显示出来-->
-        <div v-if="roleName.indexOf('admin') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 || roleName.indexOf('应付查看') != -1))"
+        <div v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('利润查看') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 || roleName.indexOf('应付查看') != -1))"
             style="display: flex;align-items: center;justify-content: space-around">
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
-                    <div style="text-align: center">
-                        <div class="weightfont">¥</div>
-                        <div>CNY</div>
-                    </div>
                     <div>
                         <div style="color: #81B337">
                             <span>应收:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountDr }}元</span>
                         </div>
+                    </div>
+                    <div>
                         <div style="color: #6BBCD1">
                             <span>应付:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountCr }}元</span>
@@ -340,15 +338,13 @@
             </div>
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
-                    <div style="text-align: center">
-                        <div class="weightfont">$</div>
-                        <div>USD</div>
-                    </div>
                     <div>
                         <div style="color: #81B337">
                             <span>应收:</span>
                             <span class="weightnum">${{ assemblyForm.amountDrUsd }}元</span>
                         </div>
+                    </div>
+                    <div>
                         <div style="color: #6BBCD1">
                             <span>应付:</span>
                             <span class="weightnum">${{ assemblyForm.amountCrUsd }}元</span>
@@ -362,15 +358,14 @@
             </div>
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
-                    <div style="text-align: center">
-                        <div class="weightfont">¥</div>
-                        <div>CNY合计</div>
-                    </div>
                     <div>
                         <div style="color: #81B337">
                             <span>应收:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountDrLoc }}元</span>
                         </div>
+
+                    </div>
+                    <div>
                         <div style="color: #6BBCD1">
                             <span>应付:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountCrLoc }}元</span>
@@ -1914,7 +1909,7 @@ export default {
                 });
                 return
             }
-            this.$set(row, 'amount', Number(row.price) * Number(row.quantity ? row.quantity : 0))
+            this.$set(row, 'amount', Number(row.price?row.price:0) * Number(row.quantity ? row.quantity : 0))
             // 判断是否有币种
             if (!row.curCode) {
                 return;
@@ -1941,7 +1936,7 @@ export default {
                 this.$set(row, 'quantity', 1)
                 return
             }
-            this.$set(row, 'amount', Number(row.price ? row.price : 0) * Number(row.quantity))
+            this.$set(row, 'amount', Number(row.price ? row.price : 0) * Number(row.quantity?row.quantity:0))
             // 判断是否有币种
             if (!row.curCode) {
                 return;

src/views/iosBasicData/reportClose/SIreportClose/assembly/feecenter.vue

@@ -148,12 +148,12 @@
                 </template>
                 <template slot="price" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.price" size="small" :controls="false" :precision="2"
-                        placeholder="请输入" @blur="priceinputfun($event, row)"></el-input-number>
+                        placeholder="请输入" @blur="priceinputfun($event, row)" style="width: 100%;"></el-input-number>
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1" :controls="false"
-                        :precision="0" placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
+                        :precision="0" placeholder="请输入" @blur="quantityinputfun(row)" style="width: 100%;"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -287,12 +287,12 @@
                 </template>
                 <template slot="price" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.price" size="small" :controls="false" :precision="2"
-                        placeholder="请输入" @blur="priceinputfun($event, row)"></el-input-number>
+                        placeholder="请输入" @blur="priceinputfun($event, row)" style="width: 100%;"></el-input-number>
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
                     <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1" :controls="false"
-                        :precision="0" placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
+                        :precision="0" placeholder="请输入" @blur="quantityinputfun(row)" style="width: 100%;"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -312,19 +312,17 @@
             :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :option="sumOption"
             :data="sumData"></avue-crud>
         <!--有admin 显示，有收和付各一个也显示出来-->
-        <div v-if="roleName.indexOf('admin') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 || roleName.indexOf('应付查看') != -1))"
+        <div v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('利润查看') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 || roleName.indexOf('应付查看') != -1))"
             style="display: flex;align-items: center;justify-content: space-around">
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
-                    <div style="text-align: center">
-                        <div class="weightfont">¥</div>
-                        <div>CNY</div>
-                    </div>
                     <div>
                         <div style="color: #81B337">
                             <span>应收:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountDr }}元</span>
                         </div>
+                    </div>
+                    <div>
                         <div style="color: #6BBCD1">
                             <span>应付:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountCr }}元</span>
@@ -338,15 +336,13 @@
             </div>
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
-                    <div style="text-align: center">
-                        <div class="weightfont">$</div>
-                        <div>USD</div>
-                    </div>
                     <div>
                         <div style="color: #81B337">
                             <span>应收:</span>
                             <span class="weightnum">${{ assemblyForm.amountDrUsd }}元</span>
                         </div>
+                    </div>
+                    <div>
                         <div style="color: #6BBCD1">
                             <span>应付:</span>
                             <span class="weightnum">${{ assemblyForm.amountCrUsd }}元</span>
@@ -360,15 +356,14 @@
             </div>
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
-                    <div style="text-align: center">
-                        <div class="weightfont">¥</div>
-                        <div>CNY合计</div>
-                    </div>
                     <div>
                         <div style="color: #81B337">
                             <span>应收:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountDrLoc }}元</span>
                         </div>
+
+                    </div>
+                    <div>
                         <div style="color: #6BBCD1">
                             <span>应付:</span>
                             <span class="weightnum">¥{{ assemblyForm.amountCrLoc }}元</span>
@@ -1910,7 +1905,7 @@ export default {
                 });
                 return
             }
-            this.$set(row, 'amount', Number(row.price) * Number(row.quantity ? row.quantity : 0))
+            this.$set(row, 'amount', Number(row.price ? row.price : 0) * Number(row.quantity?row.quantity:0))
             // 判断是否有币种
             if (!row.curCode) {
                 return;
@@ -1937,7 +1932,7 @@ export default {
                 this.$set(row, 'quantity', 1)
                 return
             }
-            this.$set(row, 'amount', Number(row.price ? row.price : 0) * Number(row.quantity))
+            this.$set(row, 'amount', Number(row.price ? row.price : 0) * Number(row.quantity?row.quantity:0))
             // 判断是否有币种
             if (!row.curCode) {
                 return;

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

@@ -455,7 +455,7 @@ export default {
       this.params = {
         customerId: this.form.corpId,
         generateTask: '已生成',
-        bsType: 'XS,TKXS',
+        bsType: 'XS,TKXS,GX',
         actualPaymentStatus: '2'
       }
       this.billDetailDialog = true;
@@ -477,10 +477,10 @@ export default {
       let sum2=0
       list.forEach((item, index) => {
         item.contractNumber = item.ordNo;
-        item.accountsAmount = item.bsType == "XS"?item.totalMoney:item.returnsAmount
+        item.accountsAmount = item.bsType == "XS"||item.bsType == "GX"?item.totalMoney:item.returnsAmount
         item.settlmentAmount = item.paymentAmountTl
         item.businesType=item.bsType
-        this.$set(item,'thisAmount',item.bsType=="XS"?(Number(item.totalMoney) - Number(item.paymentAmountTl)):0)
+        this.$set(item,'thisAmount',item.bsType=="XS"||item.bsType == "GX"?(Number(item.totalMoney) - Number(item.paymentAmountTl)):0)
         this.$set(item,'thisRefundAmount',item.bsType=="TKXS"?(Number(item.returnsAmount) - Number(item.paymentAmountTl)):0)
         // item.thisAmount =item.bsType=="XS"?(Number(item.totalMoney) - Number(item.paymentAmountTl)):0
         // item.thisRefundAmount =item.bsType=="TKXS"? (Number(item.totalMoney) - Number(item.paymentAmountTl)):0
@@ -492,7 +492,7 @@ export default {
         delete item.ordNo;
         this.$refs.formContacts.rowCellAdd(item);
         //计算主表金额
-        sum1+=item.bsType=="XS"?(Number(item.totalMoney) - Number(item.paymentAmountTl)):0
+        sum1+=item.bsType=="XS"||item.bsType == "GX"?(Number(item.totalMoney) - Number(item.paymentAmountTl)):0
         sum2+=item.bsType=="TKXS"? (Number(item.totalMoney) - Number(item.paymentAmountTl)):0
         this.form.amount=sum1-sum2
       })

src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -1975,7 +1975,7 @@ export default {
                 }
                 balancePayment(obj).then(res => {
                     this.wkForm = res.data.data
-                    this.wkForm.amountD = _.subtract(res.data.data.goodsValue, res.data.data.prepaidAmount)
+                    this.wkForm.amountD = _.subtract(res.data.data.goodsValue, res.data.data.prepaidAmount).toFixed(2)
                     res.data.data.agentItemsRList.forEach(e => {
                         e.$cellEdit = true
                     })
@@ -2060,7 +2060,7 @@ export default {
                 }
                 balancePayment(obj).then(res => {
                     this.wkForm = res.data.data
-                    this.wkForm.amountD = _.subtract(res.data.data.goodsValue, res.data.data.prepaidAmount)
+                    this.wkForm.amountD = _.subtract(res.data.data.goodsValue, res.data.data.prepaidAmount).toFixed(2)
                     res.data.data.agentItemsRList.forEach(e => {
                         e.$cellEdit = true
                     })