From 64041b29ebcb2438b0447445e841b1a0aeec5802 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 11 May 2024 17:26:50 +0800
Subject: [PATCH] md

---
 .../emisSpecialCalcWeightForm.vue             | 18 +++++++++++++++--
 src/views/emis/emisTransLine/index.vue        |  2 +-
 src/views/emis/emisTransProduct/index.vue     | 20 ++++++++++++-------
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue b/src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue
index 7d583998..a7d89c6d 100644
--- a/src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue
+++ b/src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue
@@ -2,9 +2,19 @@
   <div >
     <el-row :gutter="0">
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-col :span="12">
+            <el-form-item label="所属国家" prop="country">
+                <CountryPicker :placeholder="$t('所属国家')" v-model="form.country" ></CountryPicker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所属线路" prop="lineCode">
+                <TransLinePicker v-model="form.lineCode" :countryCode="form.country"></TransLinePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="产品类型" prop="prodCode">
-              <TransProductPicker placeholder="产品类型" v-model="form.prodCode" @onChange="onProdChange"></TransProductPicker>
+              <TransProductPicker placeholder="产品类型" v-model="form.prodCode" :transLineCode="form.lineCode" @onChange="onProdChange"></TransProductPicker>
             </el-form-item>
           </el-col>
         <el-col :span="12">
@@ -77,6 +87,8 @@
 <script>
 import { listEmisSpecialCalcWeight, getEmisSpecialCalcWeight, delEmisSpecialCalcWeight, addEmisSpecialCalcWeight, updateEmisSpecialCalcWeight } from "@/api/emis/emisSpecialCalcWeight";
 import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
+import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
 
 export default {
   name: "emisSpecialCalcWeightForm",
@@ -85,7 +97,7 @@ export default {
       type:Number,
     }
   },
-  components: { TransProductPicker },
+  components: { CountryPicker,TransLinePicker,TransProductPicker },
   dicts: [
         'sys_normal_disable',
         'emis_take_weight_method',
@@ -161,6 +173,8 @@ export default {
     reset() {
       this.form = {
         id: null,
+        country: null,
+        lineCode: null,
         prodCode: null,
         prodName: null,
         status: null,
diff --git a/src/views/emis/emisTransLine/index.vue b/src/views/emis/emisTransLine/index.vue
index 617dfc5a..5815d2f7 100644
--- a/src/views/emis/emisTransLine/index.vue
+++ b/src/views/emis/emisTransLine/index.vue
@@ -25,7 +25,7 @@
           </el-form-item>
           <el-form-item label="启用状态" prop="status">
             <el-select v-model="queryParams.status" no-match-text filterable placeholder="启用状态" @change="handleQuery">
-              <el-option key="0" label="未启用" :value="0" />
+              <el-option key="0" label="停用" :value="0" />
               <el-option key="1" label="启用" :value="1" />
             </el-select>
           </el-form-item>
diff --git a/src/views/emis/emisTransProduct/index.vue b/src/views/emis/emisTransProduct/index.vue
index 0e06353f..551b1dea 100644
--- a/src/views/emis/emisTransProduct/index.vue
+++ b/src/views/emis/emisTransProduct/index.vue
@@ -6,14 +6,14 @@
       </el-col> -->
       <el-col :span="24" :xs="24">
         <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="10"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-          <el-form-item label="" prop="country">
+          <el-form-item :label="$t('国家')" prop="country">
             <CountryPicker :placeholder="$t('国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
           </el-form-item>
-          <el-form-item label="" prop="transLineCode">
+          <el-form-item :label="$t('所属线路')" prop="transLineCode">
             <TransLinePicker :placeholder="$t('所属线路')" v-model="queryParams.transLineCode" :countryCode="queryParams.country" @onChange="handleQuery"></TransLinePicker>
           </el-form-item>
 
-          <el-form-item label="" prop="prodName">
+          <el-form-item :label="$t('类型名称')" prop="prodName">
             <el-input
               v-model="queryParams.prodName"
               placeholder="类型名称"
@@ -29,7 +29,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item> -->
-          <el-form-item label="" prop="agingDesc">
+          <el-form-item label="时效描述" prop="agingDesc">
             <el-input
               v-model="queryParams.agingDesc"
               placeholder="时效描述"
@@ -37,7 +37,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="" prop="carryType">
+          <el-form-item label="取重方式" prop="carryType">
             <el-select v-model="queryParams.carrType" placeholder="取重方式" clearable @change="handleQuery">
               <el-option
                 v-for="dict in dict.type.emis_take_weight_method"
@@ -47,7 +47,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="" prop="transType">
+          <el-form-item label="承运方式" prop="transType">
             <el-select v-model="queryParams.transType" placeholder="承运方式" clearable @change="handleQuery">
               <el-option
                 v-for="dict in dict.type.emis_biz_shipping_method"
@@ -57,6 +57,12 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="启用状态" prop="status">
+            <el-select v-model="queryParams.status" no-match-text filterable placeholder="启用状态" @change="handleQuery">
+              <el-option key="0" label="停用" :value="0" />
+              <el-option key="1" label="启用" :value="1" />
+            </el-select>
+          </el-form-item>
 
         </SearchForm>
 
@@ -165,7 +171,7 @@
             <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.prodCode}}</div>
          </template>
       </el-table-column> -->
-      <el-table-column label="类型名称" align="left" prop="prodName" min-width="100" >
+      <el-table-column label="类型名称" align="left" prop="prodName" min-width="150" >
         <template slot-scope="scope">
             <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.prodName}}</div>
          </template>