Merge pull request 'master-dev' (#128) from master-dev into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/128
2025-10-30 17:49:32 +08:00 · 2025-10-30 17:49:32 +08:00 · 249aab04e0
commit 249aab04e0
parent 7370479cf6 9cf938e845
5 changed files with 234 additions and 219 deletions
--- a/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue
+++ b/src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue
@ -45,7 +45,11 @@
            <el-table-column :label="$t('结算重量 ')" align="center" prop="emisWaybill.settlementWeight" min-width="100" />
            <el-table-column :label="$t('收款状态 ')" align="center" prop="emisSettleBill.paymentStatus" min-width="100">
                <template slot-scope="scope">
-                      <dict-tag :options="dict.type.emis_settlebill_pay_status" :value="scope.row.emisSettleBill.paymentStatus"/>
+                  <!-- 收款状态 展示不同颜色的标签 -->
+                  <el-tag v-if="scope.row.emisSettleBill.paymentStatus=='0'" type="error">未收款</el-tag>
+                  <el-tag v-if="scope.row.emisSettleBill.paymentStatus=='1'" type="success">已收款</el-tag>
+                  <el-tag v-if="scope.row.emisSettleBill.paymentStatus=='2'" type="warning">部分收款</el-tag>
+                  <!-- <dict-tag :options="dict.type.emis_settlebill_pay_status" :value="scope.row.emisSettleBill.paymentStatus"/> -->
                </template>
            </el-table-column>
            <el-table-column :label="$t('开票状态 ')" align="center" prop="emisSettleBill.chargeStatus" min-width="100">
--- a/src/views/emis/emisWaybill/waybillGot.vue
+++ b/src/views/emis/emisWaybill/waybillGot.vue
@ -2725,35 +2725,32 @@ methods: {
          return true;
        }
        this.categorySender = data.category;
-        let msg = '';
-        let color = '';
-        if (this.categorySender === '2' ) {
-          msg = `该公司为特区货物报关比较麻烦，请注意跟进。`;
-          color = '#fccc0c';
-        } else if (this.categorySender === '3') {
-          msg = `该公司报关资料不配合存在过异常，请及时跟进。`;
-          color = 'red';
-        } else if (this.categorySender === '4') {
-          msg = `该公司报关有问题无法报关，禁止走货。`;
-          color = 'black'
-        }
-        const h = this.$createElement;
-        this.$msgbox({
-          title: '提示',
-          message: h('p', {
-            style: {
-              color: color,
-              // fontSize: '18px'
-            }
-          }, [
-            h('li', { class: 'el-icon-warning' }, ''),
-            h('span', null, msg),
-          ]),
-          showCancelButton: false,
-          confirmButtonText: '确定',
-          closeOnClickModal: false,
-          closeOnPressEscape: false,
-          showClose: false
+        const msgMap = {
+          '2': `该公司为特区货物报关比较麻烦，请注意跟进。`,
+          '3': `该公司报关资料不配合存在过异常，请及时跟进。`,
+          '4': `该公司报关有问题无法报关，禁止走货。`
+        };
+        const colorMap = {
+          '2': '#fccc0c',
+          '3': 'red',
+          '4': 'black'
+        };
+        const dynamicHtml=`
+        <div>
+          <div style="color:${colorMap[this.categorySender]};">
+            <li class="el-icon-warning" style="font-size: 22px;margin-right: 5px;"></li>
+            <span style="font-size: 16px;font-weight: bold;">${msgMap[this.categorySender]}</span>
+          </div>
+          <div style="margin-top: 10px;">
+            <p> <span style="color:green;">绿色</span> <span>:无弹窗</span></p>
+            <p> <span style="color:${colorMap['2']};">黄色</span> <span>:${msgMap['2']}</span></p>
+            <p> <span style="color:${colorMap['3']};">红色</span> <span>:${msgMap['3']}</span></p>
+            <p> <span style="color:${colorMap['4']};">黑色</span> <span>:${msgMap['4']}</span></p>
+          </div>  
+        </div>
+        `;
+        this.$alert(dynamicHtml, '提示',{
+                    dangerouslyUseHTMLString: true
        }).then(() => {
            this.$refs.form.validateField('sender.enterpriseName');
        });
@ -2795,39 +2792,44 @@ methods: {
        this.categoryReciever = data.category;
        let msg = '';
        let color = '';
+        const msgMap = {
+          '2': `该公司为特区货物清关比较麻烦，请注意跟进。`,
+          '3': `该公司清关资料不配合存在过异常，请及时跟进。`,
+          '4': `该公司清关有问题无法清关，禁止走货。`
+        };
+        const colorMap = {
+          '2': '#fccc0c',
+          '3': 'red',
+          '4': 'black'
+        };
        // 判断是否是特区
        let SpecialZone =false;
        if(address){
          SpecialZone = address.includes('Special Economic Zone') || this.recieverRegionName.includes('特区') || this.recieverRegionName === '中柬金属材料产业园';
        }
-        console.log('---checkRecieverCompany1111' ,this.categoryReciever,SpecialZone);
        if ((this.categoryReciever === '2' || (SpecialZone && this.categoryReciever !=='4'))) {
-          msg = `该公司为特区货物清关比较麻烦，请注意跟进。`;
-          color = '#fccc0c';
-        } else if (this.categoryReciever === '3') {
-          msg = `该公司清关资料不配合存在过异常，请及时跟进。`;
-          color = 'red';
-        } else if (this.categoryReciever === '4') {
-          msg = `该公司清关有问题无法清关，禁止走货。`;
-          color = 'black'
+          msg = msgMap['2'];
+          color = colorMap['2'];
+        } else {
+          msg = msgMap[this.categoryReciever];
+          color = colorMap[this.categoryReciever];
        }
-        const h = this.$createElement;
-        this.$msgbox({
-          title: '提示',
-          message: h('p', {
-            style: {
-              color: color,
-              // fontSize: '18px'
-            }
-          }, [
-            h('li', { class: 'el-icon-warning' }, ''),
-            h('span', null, msg),
-          ]),
-          showCancelButton: false,
-          confirmButtonText: '确定',
-          closeOnClickModal: false,
-          closeOnPressEscape: false,
-          showClose: false
+        const dynamicHtml=`
+          <div>       
+            <div style="color:${color};">
+              <li class="el-icon-warning" style="font-size: 22px;margin-right: 5px;"></li>
+              <span style="font-size: 16px;font-weight: bold;">${msg}</span>
+            </div>
+            <div style="margin-top: 10px;">
+              <p> <span style="color:green;">绿色</span> <span>:无弹窗</span></p>
+              <p> <span style="color:${colorMap['2']};">黄色</span> <span>:${msgMap['2']}</span></p>
+              <p> <span style="color:${colorMap['3']};">红色</span> <span>:${msgMap['3']}</span></p>
+              <p> <span style="color:${colorMap['4']};">黑色</span> <span>:${msgMap['4']}</span></p>
+            </div>  
+          </div>
+          `;
+        this.$alert(dynamicHtml, '提示',{
+                    dangerouslyUseHTMLString: true
        }).then(() => {
          this.$refs.form.validateField('reciever.company');
        });
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@ -2702,7 +2702,7 @@ methods: {
    }
  },
                                                     
- // 校验寄件企业等级
+  // 校验寄件企业等级
  checkEnterprise(enterpriseName) {
    if(!enterpriseName || this.form.sender.country !== '0086' ){
      this.categorySender = null;
@ -2729,35 +2729,32 @@ methods: {
          return true;
        }
        this.categorySender = data.category;
-        let msg = '';
-        let color = '';
-        if (this.categorySender === '2' ) {
-          msg = `该公司为特区货物报关比较麻烦，请注意跟进。`;
-          color = '#fccc0c';
-        } else if (this.categorySender === '3') {
-          msg = `该公司报关资料不配合存在过异常，请及时跟进。`;
-          color = 'red';
-        } else if (this.categorySender === '4') {
-          msg = `该公司报关有问题无法报关，禁止走货。`;
-          color = 'black'
-        }
-        const h = this.$createElement;
-        this.$msgbox({
-          title: '提示',
-          message: h('p', {
-            style: {
-              color: color,
-              // fontSize: '18px'
-            }
-          }, [
-            h('li', { class: 'el-icon-warning' }, ''),
-            h('span', null, msg),
-          ]),
-          showCancelButton: false,
-          confirmButtonText: '确定',
-          closeOnClickModal: false,
-          closeOnPressEscape: false,
-          showClose: false
+        const msgMap = {
+          '2': `该公司为特区货物报关比较麻烦，请注意跟进。`,
+          '3': `该公司报关资料不配合存在过异常，请及时跟进。`,
+          '4': `该公司报关有问题无法报关，禁止走货。`
+        };
+        const colorMap = {
+          '2': '#fccc0c',
+          '3': 'red',
+          '4': 'black'
+        };
+        const dynamicHtml=`
+        <div>
+          <div style="color:${colorMap[this.categorySender]};">
+            <li class="el-icon-warning" style="font-size: 22px;margin-right: 5px;"></li>
+            <span style="font-size: 16px;font-weight: bold;">${msgMap[this.categorySender]}</span>
+          </div>
+          <div style="margin-top: 10px;">
+            <p> <span style="color:green;">绿色</span> <span>:无弹窗</span></p>
+            <p> <span style="color:${colorMap['2']};">黄色</span> <span>:${msgMap['2']}</span></p>
+            <p> <span style="color:${colorMap['3']};">红色</span> <span>:${msgMap['3']}</span></p>
+            <p> <span style="color:${colorMap['4']};">黑色</span> <span>:${msgMap['4']}</span></p>
+          </div>  
+        </div>
+        `;
+        this.$alert(dynamicHtml, '提示',{
+                    dangerouslyUseHTMLString: true
        }).then(() => {
            this.$refs.form.validateField('sender.enterpriseName');
        });
@ -2799,38 +2796,44 @@ methods: {
        this.categoryReciever = data.category;
        let msg = '';
        let color = '';
+        const msgMap = {
+          '2': `该公司为特区货物清关比较麻烦，请注意跟进。`,
+          '3': `该公司清关资料不配合存在过异常，请及时跟进。`,
+          '4': `该公司清关有问题无法清关，禁止走货。`
+        };
+        const colorMap = {
+          '2': '#fccc0c',
+          '3': 'red',
+          '4': 'black'
+        };
        // 判断是否是特区
        let SpecialZone =false;
        if(address){
          SpecialZone = address.includes('Special Economic Zone') || this.recieverRegionName.includes('特区') || this.recieverRegionName === '中柬金属材料产业园';
        }
        if ((this.categoryReciever === '2' || (SpecialZone && this.categoryReciever !=='4'))) {
-          msg = `该公司为特区货物清关比较麻烦，请注意跟进。`;
-          color = '#fccc0c';
-        } else if (this.categoryReciever === '3') {
-          msg = `该公司清关资料不配合存在过异常，请及时跟进。`;
-          color = 'red';
-        } else if (this.categoryReciever === '4') {
-          msg = `该公司清关有问题无法清关，禁止走货。`;
-          color = 'black'
+          msg = msgMap['2'];
+          color = colorMap['2'];
+        } else {
+          msg = msgMap[this.categoryReciever];
+          color = colorMap[this.categoryReciever];
        }
-        const h = this.$createElement;
-        this.$msgbox({
-          title: '提示',
-          message: h('p', {
-            style: {
-              color: color,
-              // fontSize: '18px'
-            }
-          }, [
-            h('li', { class: 'el-icon-warning' }, ''),
-            h('span', null, msg),
-          ]),
-          showCancelButton: false,
-          confirmButtonText: '确定',
-          closeOnClickModal: false,
-          closeOnPressEscape: false,
-          showClose: false
+        const dynamicHtml=`
+          <div>       
+            <div style="color:${color};">
+              <li class="el-icon-warning" style="font-size: 22px;margin-right: 5px;"></li>
+              <span style="font-size: 16px;font-weight: bold;">${msg}</span>
+            </div>
+            <div style="margin-top: 10px;">
+              <p> <span style="color:green;">绿色</span> <span>:无弹窗</span></p>
+              <p> <span style="color:${colorMap['2']};">黄色</span> <span>:${msgMap['2']}</span></p>
+              <p> <span style="color:${colorMap['3']};">红色</span> <span>:${msgMap['3']}</span></p>
+              <p> <span style="color:${colorMap['4']};">黑色</span> <span>:${msgMap['4']}</span></p>
+            </div>  
+          </div>
+          `;
+        this.$alert(dynamicHtml, '提示',{
+                    dangerouslyUseHTMLString: true
        }).then(() => {
          this.$refs.form.validateField('reciever.company');
        });
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@ -2694,35 +2694,32 @@ methods: {
          return true;
        }
        this.categorySender = data.category;
-        let msg = '';
-        let color = '';
-        if (this.categorySender === '2' ) {
-          msg = `该公司为特区货物报关比较麻烦，请注意跟进。`;
-          color = '#fccc0c';
-        } else if (this.categorySender === '3') {
-          msg = `该公司报关资料不配合存在过异常，请及时跟进。`;
-          color = 'red';
-        } else if (this.categorySender === '4') {
-          msg = `该公司报关有问题无法报关，禁止走货。`;
-          color = 'black'
-        }
-        const h = this.$createElement;
-        this.$msgbox({
-          title: '提示',
-          message: h('p', {
-            style: {
-              color: color,
-              // fontSize: '18px'
-            }
-          }, [
-            h('li', { class: 'el-icon-warning' }, ''),
-            h('span', null, msg),
-          ]),
-          showCancelButton: false,
-          confirmButtonText: '确定',
-          closeOnClickModal: false,
-          closeOnPressEscape: false,
-          showClose: false
+        const msgMap = {
+          '2': `该公司为特区货物报关比较麻烦，请注意跟进。`,
+          '3': `该公司报关资料不配合存在过异常，请及时跟进。`,
+          '4': `该公司报关有问题无法报关，禁止走货。`
+        };
+        const colorMap = {
+          '2': '#fccc0c',
+          '3': 'red',
+          '4': 'black'
+        };
+        const dynamicHtml=`
+        <div>
+          <div style="color:${colorMap[this.categorySender]};">
+            <li class="el-icon-warning" style="font-size: 22px;margin-right: 5px;"></li>
+            <span style="font-size: 16px;font-weight: bold;">${msgMap[this.categorySender]}</span>
+          </div>
+          <div style="margin-top: 10px;">
+            <p> <span style="color:green;">绿色</span> <span>:无弹窗</span></p>
+            <p> <span style="color:${colorMap['2']};">黄色</span> <span>:${msgMap['2']}</span></p>
+            <p> <span style="color:${colorMap['3']};">红色</span> <span>:${msgMap['3']}</span></p>
+            <p> <span style="color:${colorMap['4']};">黑色</span> <span>:${msgMap['4']}</span></p>
+          </div>  
+        </div>
+        `;
+        this.$alert(dynamicHtml, '提示',{
+                    dangerouslyUseHTMLString: true
        }).then(() => {
            this.$refs.form.validateField('sender.enterpriseName');
        });
@ -2764,38 +2761,44 @@ methods: {
        this.categoryReciever = data.category;
        let msg = '';
        let color = '';
+        const msgMap = {
+          '2': `该公司为特区货物清关比较麻烦，请注意跟进。`,
+          '3': `该公司清关资料不配合存在过异常，请及时跟进。`,
+          '4': `该公司清关有问题无法清关，禁止走货。`
+        };
+        const colorMap = {
+          '2': '#fccc0c',
+          '3': 'red',
+          '4': 'black'
+        };
        // 判断是否是特区
        let SpecialZone =false;
        if(address){
          SpecialZone = address.includes('Special Economic Zone') || this.recieverRegionName.includes('特区') || this.recieverRegionName === '中柬金属材料产业园';
        }
        if ((this.categoryReciever === '2' || (SpecialZone && this.categoryReciever !=='4'))) {
-          msg = `该公司为特区货物清关比较麻烦，请注意跟进。`;
-          color = '#fccc0c';
-        } else if (this.categoryReciever === '3') {
-          msg = `该公司清关资料不配合存在过异常，请及时跟进。`;
-          color = 'red';
-        } else if (this.categoryReciever === '4') {
-          msg = `该公司清关有问题无法清关，禁止走货。`;
-          color = 'black'
+          msg = msgMap['2'];
+          color = colorMap['2'];
+        } else {
+          msg = msgMap[this.categoryReciever];
+          color = colorMap[this.categoryReciever];
        }
-        const h = this.$createElement;
-        this.$msgbox({
-          title: '提示',
-          message: h('p', {
-            style: {
-              color: color,
-              // fontSize: '18px'
-            }
-          }, [
-            h('li', { class: 'el-icon-warning' }, ''),
-            h('span', null, msg),
-          ]),
-          showCancelButton: false,
-          confirmButtonText: '确定',
-          closeOnClickModal: false,
-          closeOnPressEscape: false,
-          showClose: false
+        const dynamicHtml=`
+          <div>       
+            <div style="color:${color};">
+              <li class="el-icon-warning" style="font-size: 22px;margin-right: 5px;"></li>
+              <span style="font-size: 16px;font-weight: bold;">${msg}</span>
+            </div>
+            <div style="margin-top: 10px;">
+              <p> <span style="color:green;">绿色</span> <span>:无弹窗</span></p>
+              <p> <span style="color:${colorMap['2']};">黄色</span> <span>:${msgMap['2']}</span></p>
+              <p> <span style="color:${colorMap['3']};">红色</span> <span>:${msgMap['3']}</span></p>
+              <p> <span style="color:${colorMap['4']};">黑色</span> <span>:${msgMap['4']}</span></p>
+            </div>  
+          </div>
+          `;
+        this.$alert(dynamicHtml, '提示',{
+                    dangerouslyUseHTMLString: true
        }).then(() => {
          this.$refs.form.validateField('reciever.company');
        });
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@ -2384,35 +2384,32 @@ export default {
          return true;
        }
        this.categorySender = data.category;
-        let msg = '';
-        let color = '';
-        if (this.categorySender === '2' ) {
-          msg = `该公司为特区货物报关比较麻烦，请注意跟进。`;
-          color = '#fccc0c';
-        } else if (this.categorySender === '3') {
-          msg = `该公司报关资料不配合存在过异常，请及时跟进。`;
-          color = 'red';
-        } else if (this.categorySender === '4') {
-          msg = `该公司报关有问题无法报关，禁止走货。`;
-          color = 'black'
-        }
-        const h = this.$createElement;
-        this.$msgbox({
-          title: '提示',
-          message: h('p', {
-            style: {
-              color: color,
-              // fontSize: '18px'
-            }
-          }, [
-            h('li', { class: 'el-icon-warning' }, ''),
-            h('span', null, msg),
-          ]),
-          showCancelButton: false,
-          confirmButtonText: '确定',
-          closeOnClickModal: false,
-          closeOnPressEscape: false,
-          showClose: false
+        const msgMap = {
+          '2': `该公司为特区货物报关比较麻烦，请注意跟进。`,
+          '3': `该公司报关资料不配合存在过异常，请及时跟进。`,
+          '4': `该公司报关有问题无法报关，禁止走货。`
+        };
+        const colorMap = {
+          '2': '#fccc0c',
+          '3': 'red',
+          '4': 'black'
+        };
+        const dynamicHtml=`
+        <div>
+          <div style="color:${colorMap[this.categorySender]};">
+            <li class="el-icon-warning" style="font-size: 22px;margin-right: 5px;"></li>
+            <span style="font-size: 16px;font-weight: bold;">${msgMap[this.categorySender]}</span>
+          </div>
+          <div style="margin-top: 10px;">
+            <p> <span style="color:green;">绿色</span> <span>:无弹窗</span></p>
+            <p> <span style="color:${colorMap['2']};">黄色</span> <span>:${msgMap['2']}</span></p>
+            <p> <span style="color:${colorMap['3']};">红色</span> <span>:${msgMap['3']}</span></p>
+            <p> <span style="color:${colorMap['4']};">黑色</span> <span>:${msgMap['4']}</span></p>
+          </div>  
+        </div>
+        `;
+        this.$alert(dynamicHtml, '提示',{
+                    dangerouslyUseHTMLString: true
        }).then(() => {
            this.$refs.form.validateField('sender.enterpriseName');
        });
@ -2454,38 +2451,44 @@ export default {
        this.categoryReciever = data.category;
        let msg = '';
        let color = '';
+        const msgMap = {
+          '2': `该公司为特区货物清关比较麻烦，请注意跟进。`,
+          '3': `该公司清关资料不配合存在过异常，请及时跟进。`,
+          '4': `该公司清关有问题无法清关，禁止走货。`
+        };
+        const colorMap = {
+          '2': '#fccc0c',
+          '3': 'red',
+          '4': 'black'
+        };
        // 判断是否是特区
        let SpecialZone =false;
        if(address){
          SpecialZone = address.includes('Special Economic Zone') || this.recieverRegionName.includes('特区') || this.recieverRegionName === '中柬金属材料产业园';
        }
        if ((this.categoryReciever === '2' || (SpecialZone && this.categoryReciever !=='4'))) {
-          msg = `该公司为特区货物清关比较麻烦，请注意跟进。`;
-          color = '#fccc0c';
-        } else if (this.categoryReciever === '3') {
-          msg = `该公司清关资料不配合存在过异常，请及时跟进。`;
-          color = 'red';
-        } else if (this.categoryReciever === '4') {
-          msg = `该公司清关有问题无法清关，禁止走货。`;
-          color = 'black'
+          msg = msgMap['2'];
+          color = colorMap['2'];
+        } else {
+          msg = msgMap[this.categoryReciever];
+          color = colorMap[this.categoryReciever];
        }
-        const h = this.$createElement;
-        this.$msgbox({
-          title: '提示',
-          message: h('p', {
-            style: {
-              color: color,
-              // fontSize: '18px'
-            }
-          }, [
-            h('li', { class: 'el-icon-warning' }, ''),
-            h('span', null, msg),
-          ]),
-          showCancelButton: false,
-          confirmButtonText: '确定',
-          closeOnClickModal: false,
-          closeOnPressEscape: false,
-          showClose: false
+        const dynamicHtml=`
+          <div>       
+            <div style="color:${color};">
+              <li class="el-icon-warning" style="font-size: 22px;margin-right: 5px;"></li>
+              <span style="font-size: 16px;font-weight: bold;">${msg}</span>
+            </div>
+            <div style="margin-top: 10px;">
+              <p> <span style="color:green;">绿色</span> <span>:无弹窗</span></p>
+              <p> <span style="color:${colorMap['2']};">黄色</span> <span>:${msgMap['2']}</span></p>
+              <p> <span style="color:${colorMap['3']};">红色</span> <span>:${msgMap['3']}</span></p>
+              <p> <span style="color:${colorMap['4']};">黑色</span> <span>:${msgMap['4']}</span></p>
+            </div>  
+          </div>
+          `;
+        this.$alert(dynamicHtml, '提示',{
+                    dangerouslyUseHTMLString: true
        }).then(() => {
          this.$refs.form.validateField('reciever.company');
        });