费用，EDI等

src/views/approval/processConfigH/config/mainList.json

@@ -26,14 +26,14 @@
       "overHidden": true,
       "searchSpan": 8
     },
-      {
-          "label": "审核路径名",
-          "prop": "pathName",
-          "search": true,
-          "index": 2,
-          "overHidden": true,
-          "searchSpan": 8
-      },
+    {
+      "label": "审核路径名",
+      "prop": "pathName",
+      "search": true,
+      "index": 2,
+      "overHidden": true,
+      "searchSpan": 8
+    },
     {
       "label": "维护人",
       "prop": "opUserName",

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

@@ -51,6 +51,29 @@
                             </el-form-item>
                         </el-col>
                     </el-row>
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="自定义1" prop="userDefine1">
+                                <span slot="label">
+                                    <span style="color: #1e9fff">自定义1</span>
+                                </span>
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.hmmEdi.userDefine1"
+                                          size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                          placeholder=""></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="自定义2" prop="userDefine2">
+                                <span slot="label">
+                                    <span style="color: #1e9fff">自定义2</span>
+                                </span>
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.hmmEdi.userDefine2"
+                                          size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                          placeholder=""></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <!-- 此处不再重复显示
                     <el-form-item label="订舱备注" prop="bookingRemarks">
                         <span slot="label">
                             <span style="color: #1e9fff">订舱备注</span>
@@ -59,6 +82,7 @@
                             size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="3" clearable
                             placeholder="请输入订舱备注"></el-input>
                     </el-form-item>
+                    -->
                 </el-col>
                 <el-col :span="12">
                     <el-row>
@@ -105,6 +129,29 @@
                             </el-form-item>
                         </el-col>
                     </el-row>
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="自定义3" prop="userDefine3">
+                                <span slot="label">
+                                    <span style="color: #1e9fff">自定义3</span>
+                                </span>
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.hmmEdi.userDefine3"
+                                          size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                          placeholder=""></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="自定义4" prop="userDefine4">
+                                <span slot="label">
+                                    <span style="color: #1e9fff">自定义4</span>
+                                </span>
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.hmmEdi.userDefine4"
+                                          size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                          placeholder=""></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <!-- 此处不再重复显示
                     <el-form-item label="SI备注" prop="siRemarks">
                         <span slot="label">
                             <span style="color: #1e9fff">SI备注</span>
@@ -113,6 +160,7 @@
                             autocomplete="off" :disabled="detailData.seeDisabled" rows="3" clearable
                             placeholder="请输入SI备注"></el-input>
                     </el-form-item>
+                    -->
                 </el-col>
             </el-row>
         </el-form>
@@ -144,14 +192,19 @@ export default {
             pilHblData: [],
         }
     },
+    created() {
+        this.pilHblfun();
+    },
     methods: {
         pilHblChange(value) {
             this.$set(this.assemblyForm, 'pilHbl', value)
         },
         pilHblfun() {
-            getWorkDicts('pilhbl_los').then(res => {
-                this.pilHblData = res.data.data
-            })
+            if(this.pilHblData.length==0) {
+                getWorkDicts('pilhbl_los').then(res => {
+                    this.pilHblData = res.data.data
+                })
+            }
         },
         inHmmEdi() {
             if (!this.assemblyForm.id) {

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

@@ -2234,14 +2234,32 @@ export default {
         },
         // 单价
         priceinputfun(value, row) {
-            if (Number(value) <= 0) {
+            let price=Number(row.price), qty = Number(row.quantity)
+            if(isNaN(price)){
+                price = 0.00
+                this.$set(row, 'price', price)
+            }
+            if(isNaN(qty)){
+                qty = 0.00
+                this.$set(row, 'quantity', qty)
+            }
+            /*
+            if (price <= 0) {
                 this.$message({
                     type: "warning",
                     message: "单价不能输入负数!"
                 });
                 return
             }
-            this.$set(row, 'amount', Number(row.price) * Number(row.quantity ? row.quantity : 0))
+            */
+            if (price.toFixed(4) == '0.0000') {
+                this.$message({
+                    type: "warning",
+                    message: "单价不能为零!"
+                });
+                return
+            }
+            this.$set(row, 'amount', price * qty)
             // 判断是否有币种
             if (!row.curCode) {
                 return;
@@ -2260,6 +2278,15 @@ export default {
         },
         // 数量
         quantityinputfun(row) {
+            let price=Number(row.price), qty = Number(row.quantity)
+            if(isNaN(price)){
+                price = 0.00
+                this.$set(row, 'price', price)
+            }
+            if(isNaN(qty)){
+                qty = 0.00
+                this.$set(row, 'quantity', qty)
+            }
             if (row.quantity <= 0) {
                 this.$message({
                     type: "warning",
@@ -2268,7 +2295,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', price * qty)
             // 判断是否有币种
             if (!row.curCode) {
                 return;

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

@@ -233,7 +233,7 @@
                                     <reports :id="form.id" :assemblyForm="form"
                                         :disabled="detailData.seeDisabled || showLock" businessValue="HYCK"></reports>
                                 </el-tab-pane>
-                                <el-tab-pane label="EDI CODE" name="sixth">
+                                <el-tab-pane label="EDI 及其他" name="sixth">
                                     <edicode :assemblyForm="form" :detailData="detailData" :disabled="showLock">
                                     </edicode>
                                 </el-tab-pane>
@@ -1189,7 +1189,7 @@ export default {
         },
         // 获取客户名称数据 往来单位数据
         getBcorpsListfun(cnName) {
-            getBcorpsList(1, 10, { shortName: cnName, status: 0 }).then(res => {
+            getBcorpsList(1, 20, { shortName: cnName, status: 0 }).then(res => {
                 this.columnforfun('corpCnName').dicData = res.data.data.records
             })
         },
@@ -1225,7 +1225,7 @@ export default {
         // 获取业务来源代理数据
         agentBcorpsListfun(cnName) {
             let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-            getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
+            getBcorpslistByType(1, 20, { cnName, status: 0, corpTypeName }).then(res => {
                 this.columnforfun('srcCnName').dicData = res.data.data.records
             })
         },
@@ -1910,7 +1910,7 @@ export default {
                             if (msg.length > 0) {
                                 this.$message({
                                     dangerouslyUseHTMLString: true,
-                                    message: `FORWARDING:<br>${msg.join(";<br>")}<br>存在全角或汉字符号,请确认`,
+                                    message: `FORWARDING:<br>${msg.join(";<br>")}<br>存在全角或汉字符号,，请修正后再保存！`,
                                     type: 'error'
                                 });
                                 return
@@ -1935,7 +1935,8 @@ export default {
                             msgsList.push('FORWARDING')
                         }
                         if (msgsList.length > 0) {
-                            this.$message.error(`请正确输入${msgsList.join(",")}的英文`);
+                            // this.$message.error(`请正确输入${msgsList.join(",")}的英文`);
+                            this.$message.error(`${msgsList.join(",")}存在非英文字符，如汉字等，请修正后再保存！`);
                             return;
                         }
                     }

src/views/iosBasicData/editypes/index.vue

@@ -123,35 +123,56 @@ export default {
               trigger: "blur"
             }]
           },
+            {
+                label: "类别",
+                prop: "groupName",
+                type: "select",
+                search: true,
+                dicData: [{
+                    label: 'Booking',
+                    value: 'SO'
+                }, {
+                    label: 'SI',
+                    value: 'SI'
+                }],
+                rules: [{
+                    required: true,
+                    message: "请输入类别",
+                    trigger: "blur"
+                }],
+
+                value: 'SO',
+                overHidden: true,
+            },
           {
-            label: "edi编码",
+            label: "EDI 编码",
             prop: "code",
             search: true,
             overHidden: true,
             rules: [{
               required: true,
-              message: "请输入edi 编码，唯一",
+              message: "请输入 EDI 编码，唯一",
               trigger: "blur"
             }]
           },
           {
-            label: "edi名称",
+            label: "EDI 名称",
             prop: "cnName",
             search: true,
             overHidden: true,
             rules: [{
               required: true,
-              message: "请输入edi 中文名称",
+              message: "请输入 EDI 中文名称",
               trigger: "blur"
             }]
           },
           {
-            label: "edi英文",
+            label: "EDI 英文",
             prop: "enName",
             overHidden: true,
             rules: [{
               required: true,
-              message: "请输入edi 英文名称",
+              message: "请输入 EDI 英文名称",
               trigger: "blur"
             }]
           },
@@ -173,7 +194,7 @@ export default {
           //   overHidden:true,
           // },
           {
-            label: "发送ftp/邮件",
+            label: "发送 FTP/邮件",
             prop: "address",
             hide: true,
             overHidden: true,