1

src/components/process/EHSD/ContractChange.vue

@@ -146,28 +146,36 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label=" " prop="provinceName">
-                  <selectCity
+                <el-form-item label=" " prop="provinceId">
+                  <el-select
+                    v-model="formData.data.provinceId"
                     placeholder="省/洲"
+                    filterable
                     @change="(val) => getCityData(val, '30', true)"
-                    addressId="provinceId"
-                    addressName="provinceName"
-                    v-model="formData.data"
-                    :data="provinceData"
                   >
-                  </selectCity>
+                    <el-option
+                      v-for="item in provinceData"
+                      :label="item.name"
+                      :value="item.id"
+                    >
+                    </el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label=" " prop="cityName">
-                  <selectCity
+                <el-form-item label=" " prop="cityId">
+                  <el-select
+                    v-model="formData.data.cityId"
                     placeholder="城市"
-                    addressId="cityId"
-                    addressName="cityName"
-                    v-model="formData.data"
-                    :data="cityData"
+                    filterable
                   >
-                  </selectCity>
+                    <el-option
+                      v-for="item in cityData"
+                      :label="item.name"
+                      :value="item.id"
+                    >
+                    </el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -1106,9 +1114,9 @@ const rules = ref({
   beneficiaryName: [
     { required: true, message: "请输入Beneficiary Name", trigger: "blur" },
   ],
-  // tradeMethods: [
-  //   { required: true, message: "请选择贸易方式", trigger: "change" },
-  // ],
+  tradeMethods: [
+    { required: true, message: "请选择贸易方式", trigger: "change" },
+  ],
   transportMethod: [
     { required: true, message: "请选择运输方式", trigger: "change" },
   ],

src/store/modules/tagsView.js

@@ -1,6 +1,5 @@
 const useTagsViewStore = defineStore(
-  'tags-view',
-  {
+  'tags-view', {
     state: () => ({
       visitedViews: [],
       cachedViews: [],
@@ -14,7 +13,7 @@ const useTagsViewStore = defineStore(
       addIframeView(view) {
         if (this.iframeViews.some(v => v.fullPath === view.fullPath)) return
         let title = view.meta.title || 'no-name'
-        if(view.path == '/platform_manage/process/processApproval') {
+        if (view.path == '/platform_manage/process/processApproval') {
           title = view.query.processType == 10 ? '审批' : view.query.processType == 20 ? '查看' : '发起'
         }
         this.iframeViews.push(
@@ -26,7 +25,7 @@ const useTagsViewStore = defineStore(
       addVisitedView(view) {
         if (this.visitedViews.some(v => v.fullPath === view.fullPath)) return
         let title = view.meta.title || 'no-name'
-        if(view.path == '/platform_manage/process/processApproval') {
+        if (view.path == '/platform_manage/process/processApproval') {
           title = view.query.processType == 10 ? '审批' : view.query.processType == 20 ? '查看' : '发起'
         }
         this.visitedViews.push(
@@ -153,7 +152,7 @@ const useTagsViewStore = defineStore(
             if (i > -1) {
               this.cachedViews.splice(i, 1)
             }
-            if(item.meta.link) {
+            if (item.meta.link) {
               const fi = this.iframeViews.findIndex(v => v.fullPath === item.fullPath)
               this.iframeViews.splice(fi, 1)
             }
@@ -176,7 +175,7 @@ const useTagsViewStore = defineStore(
             if (i > -1) {
               this.cachedViews.splice(i, 1)
             }
-            if(item.meta.link) {
+            if (item.meta.link) {
               const fi = this.iframeViews.findIndex(v => v.fullPath === item.fullPath)
               this.iframeViews.splice(fi, 1)
             }
@@ -188,4 +187,4 @@ const useTagsViewStore = defineStore(
     }
   })
 
-export default useTagsViewStore
+export default useTagsViewStore