11/11

src/views/main/Customer/addForm.vue

@@ -117,11 +117,9 @@
             placeholder="请选择属性字符串"
             v-decorator="['WpropString', { rules: [{ required: true, message: '请选择属性字符串！' }] }]"
           >
-            <a-select-option value="委托单位">委托单位</a-select-option>
+            <a-select-option v-for="item in propStringData" :key="item.id" :value="item.code">{{
-            <a-select-option value="车队">车队</a-select-option>
+              item.value
-            <a-select-option value="报关行">报关行</a-select-option>
+            }}</a-select-option>
-            <a-select-option value="订舱管理">订舱管理</a-select-option>
-            <a-select-option value="代理">代理</a-select-option>
           </a-select>
         </a-form-item>
       </a-col>
@@ -305,13 +303,17 @@ export default {
       confirmLoading: false,
       form: this.$form.createForm(this),
       ContactsData: [],
-      TypeData: []
+      TypeData: [],
+      propStringData: []
     }
   },
   mounted() {
     sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '346103538081861' }).then(res => {
       this.TypeData = res.data.rows
     })
+    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '346100897906757' }).then(res => {
+      this.propStringData = res.data.rows
+    })
   },
   methods: {
     removeCheckboxRow() {

src/views/main/Customer/editForm.vue

@@ -117,11 +117,9 @@
             placeholder="请选择属性字符串"
             v-decorator="['WpropString', { rules: [{ required: true, message: '请选择属性字符串！' }] }]"
           >
-            <a-select-option value="委托单位">委托单位</a-select-option>
+            <a-select-option v-for="item in propStringData" :key="item.id" :value="item.code">{{
-            <a-select-option value="车队">车队</a-select-option>
+              item.value
-            <a-select-option value="报关行">报关行</a-select-option>
+            }}</a-select-option>
-            <a-select-option value="订舱管理">订舱管理</a-select-option>
-            <a-select-option value="代理">代理</a-select-option>
           </a-select>
         </a-form-item>
       </a-col>
@@ -306,7 +304,8 @@ export default {
       form: this.$form.createForm(this),
       ContactsData: [],
       Data: {},
-      TypeData: []
+      TypeData: [],
+      propStringData: []
     }
   },
   mounted() {
@@ -334,6 +333,9 @@ export default {
     sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '346103538081861' }).then(res => {
       this.TypeData = res.data.rows
     })
+    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '346100897906757' }).then(res => {
+      this.propStringData = res.data.rows
+    })
   },
   methods: {
     removeCheckboxRow() {

src/views/main/Customer/index.vue

@@ -89,9 +89,6 @@
                 :align="item.align"
                 v-if="item.checked"
               >
-                <template #default="{ row }" v-if="item.title == '属性字符串'">
-                  <span>{{ FnRpropString(row) }}</span>
-                </template>
               </vxe-column>
               <vxe-column title="操作" fixed="right" width="200" align="center">
                 <template #default="{ row }">
@@ -220,12 +217,12 @@ const columns = [
     width: '80',
     dataIndex: 'addrEN'
   },
-  {
+  // {
-    title: '属性字符串',
+  //   title: '属性字符串',
-    align: 'center',
+  //   align: 'center',
-    width: '100',
+  //   width: '100',
-    dataIndex: 'propString'
+  //   dataIndex: 'propString'
-  },
+  // },
   {
     title: '发票抬头',
     align: 'center',