Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/box/indexSea.vue

@@ -33,24 +33,24 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="" prop="date">
+      <el-form-item label="" prop="dateType">
         <el-select v-model="queryParams.dateType" :placeholder="$t('请选择时间类型')" clearable size="small">
           <el-option v-for="item in dateTypes" :key="item.value" :label="$l(item, 'label')" :value="item.value" />
         </el-select>
       </el-form-item>
 
-      <el-form-item label="">
+      <el-form-item label="" prop="dateRangeCreateTime">
         <el-date-picker v-model="queryParams.dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
 
-      <el-form-item :label="$t('状态')">
+      <el-form-item :label="$t('状态')" prop="boxStatus">
         <el-select v-model="queryParams.boxStatus" :placeholder="$t('请选择状态')" clearable size="small">
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BOX_ORDER_SHIPMENT_STATE)" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value" />
         </el-select>
       </el-form-item>
 
-      <el-form-item :label="$t('国家')">
-        <el-select v-model="queryParams.countryId" :placeholder="$t('请选择国家')">
+      <el-form-item :label="$t('国家')" prop="countryId">
+        <el-select v-model="queryParams.countryId" :placeholder="$t('请选择国家')" clearable size="small">
           <el-option v-for="item in countryList" :key="item.id" :label="$l(item, 'title')" :value="item.id">
           </el-option>
         </el-select>
@@ -156,7 +156,7 @@
         <costForm v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" />
       </template>
       <template v-if="dialogCfg.dialogType === 'error'">
-        <regError v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" :allUsers="allUsers"/>
+        <regError v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" :allUsers="allUsers" />
       </template>
       <template v-if="dialogCfg.dialogType === 'editLadingBill'">
         <ladingBill v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" :getCabinetName="getCabinetName" />
@@ -350,10 +350,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams = {};
       this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    resetForm() {
+      this.$refs["queryForm"].resetFields();
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.$set(this.dialogCfg, "title", this.$t("添加出货"));

src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue

@@ -64,7 +64,9 @@
               </el-table-column>
               <el-table-column :label="$t('报关方式')" align="center" prop="customsType">
                 <template slot-scope="scope">
-                  <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+                  <div :class="scope.row.customsType !== 1 ? 'custom_type_red' : ''">
+                    <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('计划箱数')" align="center" prop="num">

src/views/ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue

@@ -71,7 +71,7 @@
               <el-row class="table-title">
                 <div>{{item.orderNo}}</div>
                 <div>{{$t('发往')}}：{{item.destWarehouseName}}</div>
-                <div>
+                <div :class="item.customsType !== 1 ? 'custom_type_red' : ''">
                   <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" />
                 </div>
                 <div>{{$t('入仓时间')}}：{{formatDate(item.rucangTime)}}</div>

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -147,7 +147,9 @@
                     </el-table-column>
                     <el-table-column :label="$t('报关方式')" align="center" prop="customsType" width="120">
                       <template slot-scope="scope">
-                        <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+                        <div :class="scope.row.customsType !== 1 ? 'custom_type_red' : ''">
+                          <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+                        </div>
                       </template>
                     </el-table-column>
                     <el-table-column :label="$t('备案')" align="center" prop="productRecord" width="100">
@@ -205,7 +207,7 @@
                   <p>{{item.destWarehouseName}}</p>
                 </div>
                 <div>
-                  <p>
+                  <p :class="item.customsType !== 1 ? 'custom_type_red' : ''">
                     <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" />
                   </p>
                 </div>
@@ -247,7 +249,9 @@
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('报关方式')" align="center" prop="">
-                  <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" />
+                  <div :class="item.customsType !== 1 ? 'custom_type_red' : ''">
+                    <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" />
+                  </div>
                 </el-table-column>
                 <el-table-column :label="$t('包装类型')" align="center" prop="">
                   <template slot-scope="scope">
@@ -379,7 +383,11 @@ export default {
       // 校验
       rules: {
         noticeUser: [
-          { required: true, message: this.$t("目的地操作员必填"), trigger: "change" },
+          {
+            required: true,
+            message: this.$t("目的地操作员必填"),
+            trigger: "change",
+          },
         ],
       },
       // 出货信息
@@ -426,7 +434,7 @@ export default {
     /* 获取城市 */
     importCityName(id) {
       var arr = this.$attrs.warehouseList.filter((item) => item.id == id);
-      return arr.length > 0 ? this.$l(arr[0], 'title') : this.$t("无");
+      return arr.length > 0 ? this.$l(arr[0], "title") : this.$t("无");
     },
     /* 选中行 */
     checkboxSelect(selection, part) {
@@ -472,7 +480,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.queryParams = {};
+      this.$refs["queryForm"].resetFields();
     },
     /** 提交 */
     onSubmit() {
@@ -559,9 +568,13 @@ export default {
     },
     /* 删除部分 */
     deletePart(part) {
-      this.$confirm(this.$t("确认删除该部分及其已预装订单？"), this.$t("提示"), {
-        type: "warning",
-      })
+      this.$confirm(
+        this.$t("确认删除该部分及其已预装订单？"),
+        this.$t("提示"),
+        {
+          type: "warning",
+        }
+      )
         .then((_) => {
           deleteSection(part.id).then((res) => {
             serviceMsg(res, this).then(() => {
@@ -583,10 +596,11 @@ export default {
           ),
         };
 
-        createGoods(params).then((res) => {
-          const { data } = res;
-          if(data.relationMsg) {
-              const msg = data.relationMsg.replaceAll(',',"，");
+        createGoods(params)
+          .then((res) => {
+            const { data } = res;
+            if (data.relationMsg) {
+              const msg = data.relationMsg.replaceAll(",", "，");
               this.$confirm(msg, this.$t("提示"), {
                 type: "warning",
               })
@@ -594,27 +608,28 @@ export default {
                   loadRelationOrder(data).then((res) => {
                     serviceMsg(res, this).then(() => {
                       this.queryAllData();
-                    })
-                  })
+                    });
+                  });
                 })
                 .catch((_) => {});
-          } else {
-            serviceMsg(res, this).then(() => {
-              this.queryAllData();
-            })
-          }
-        }).catch((res) => {
-            if(res.code === 555) {
-              const msg = res.msg && res.msg.replaceAll(',',"，");
+            } else {
+              serviceMsg(res, this).then(() => {
+                this.queryAllData();
+              });
+            }
+          })
+          .catch((res) => {
+            if (res.code === 555) {
+              const msg = res.msg && res.msg.replaceAll(",", "，");
               this.$confirm(msg, this.$t("提示"), {
                 type: "warning",
               })
                 .then((_) => {
-                  createGoods({...params, relationStatus: 1}).then((res) => {
+                  createGoods({ ...params, relationStatus: 1 }).then((res) => {
                     serviceMsg(res, this).then(() => {
                       this.queryAllData();
-                    })
-                  })
+                    });
+                  });
                 })
                 .catch((_) => {});
             }

src/views/ecw/box/shippingSea/nodePage/tally/index.vue

@@ -47,7 +47,9 @@
               </el-table-column>
               <el-table-column :label="$t('报关方式')" align="center" prop="customsType">
                 <template slot-scope="scope">
-                  <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+                  <div :class="scope.row.customsType !== 1 ? 'custom_type_red' : ''">
+                    <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('箱数')" align="center" prop="num">

src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue

@@ -45,7 +45,9 @@
         </el-table-column>
         <el-table-column :label="$t('报关方式')" align="center" prop="customsType">
           <template slot-scope="scope">
-            <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+            <div :class="scope.row.customsType !== 1 ? 'custom_type_red' : ''">
+              <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+            </div>
           </template>
         </el-table-column>
         <el-table-column :label="$t('实装箱数')" align="center" prop="installNum" />

src/views/ecw/box/shippingSea/shippingSea.vue

@@ -121,6 +121,9 @@ export default {
 <style lang="scss">
 // 海运操作统一弹窗样式
 .shipping-dialog {
+  .custom_type_red {
+    color: red;
+  }
   .el-dialog__body {
     height: calc(100% - 54px);
     > :first-child {

src/views/ecw/offer/components/Commossion.vue

@@ -164,6 +164,7 @@ export default {
       return Decimal(this.form.orgSeaFreight || 0)
         // .minus(this.form.orgShadeCommissionAmount || 0)
         .minus(this.form.orgLightCommissionAmount || 0)
+
     },
     // 新的成本价
     costPrice(){

src/views/ecw/order/exception/index.vue

@@ -111,9 +111,9 @@
       </el-table-column>
       <el-table-column :label="$t('总箱数/入仓箱数')" align="center" >
       <template slot-scope="scope">
-          <span v-if="scope.row.orderExceptionType!='order_doc_exception'">{{scope.row.totalBox+$t('箱/')+scope.row.warehousingBox+$t('箱')}}</span>
-          <span style="color:#ff4949" v-if="scope.row.orderExceptionType=='order_doc_exception'">{{scope.row.totalBox+$t('箱/')+scope.row.warehousingBox+$t('箱')}}</span>
-           <dict-tag style="color:#ff4949" v-if="scope.row.orderExceptionType=='order_doc_exception'" :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType"></dict-tag>
+          <p v-if="scope.row.orderExceptionType!='order_doc_exception'||scope.row.customsType==1">{{scope.row.totalBox+$t('箱/')+scope.row.warehousingBox+$t('箱')}}</p>
+          <p style="color:#ff4949" v-else>{{scope.row.totalBox+$t('箱/')+scope.row.warehousingBox+$t('箱')}}</p>
+           <dict-tag  style="color:#ff4949" v-if="scope.row.orderExceptionType=='order_doc_exception'&&scope.row.customsType!=1" :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType"></dict-tag>
         </template>
       </el-table-column>
       <el-table-column :label="$t('体积/重量')" align="center">

src/views/ecw/order/prepayDeal.vue

@@ -141,7 +141,7 @@
         </el-table-column>
         <el-table-column :label="$t('付款状态')" prop="worth">
           <template slot-scope="scope">
-              <dict-tag :type="DICT_TYPE.ECW_RECEIPT_STATE" :value="scope.row.state"></dict-tag>
+              <dict-tag :type="DICT_TYPE.ECW_RECEIVABLE_STATE" :value="scope.row.state"></dict-tag>
             </template>
           </el-table-column>
       </el-table>