[update] 标准选择改成回显用value

src/components/selection/StandardModelSelection.vue

@@ -1,74 +0,0 @@
-<template>
-  <div class="selection-wrapper">
-    <div class="box-title-text">
-      <a-input class="box-input" :value="value" :title="value" @input="indexClick($event)"
-               :disabled="isDisabled" readonly
-               :placeholder="placeholder"/>
-      <a-button v-if="!isDisabled" type="primary" class="button-box" @click="standardClick">
-        {{this.$t('standardSelect.standardSelection')}}
-      </a-button>
-    </div>
-    <standard-model-selection-modal ref="standardSelectionModal" v-bind="$attrs" :value="value" @change="modalInput" @nameChange="modalNameChange"></standard-model-selection-modal>
-  </div>
-</template>
-
-<script>
-import StandardModelSelectionModal from './StandardModelSelectionModal'
-
-export default {
-  name: 'StandardModelSelection',
-  components: { StandardModelSelectionModal },
-  props: {
-    value: {
-      type: String,
-      default: ''
-    },
-    placeholder: {
-      type: String,
-      default: ''
-    },
-    isDisabled: {
-      type: Boolean,
-      default: false
-    }
-  },
-  methods: {
-    // 点击选择标准按钮
-    standardClick () {
-      this.$refs.standardSelectionModal.open()
-    },
-    // 输入框输入监听
-    indexClick (event) {
-      this.$emit('change', event.target.value)
-    },
-    modalInput (value) {
-      this.$emit('change', value)
-    },
-    modalNameChange (value) {
-      this.$emit('nameChange', value)
-    }
-  },
-  model: {
-    prop: 'value',
-    event: 'change'
-  }
-}
-</script>
-
-<style scoped lang="less">
-.selection-wrapper {
-  height: 40px;
-  line-height: 40px;
-}
-.box-title-text {
-  height: 100%;
-  display: flex;
-  align-items: center;
-  .box-input {
-    width: 100%;
-  }
-  .button-box {
-    margin-left: 10px;
-  }
-}
-</style>

src/components/selection/StandardModelSelectionModal.vue

@@ -1,203 +0,0 @@
-<template>
-  <a-drawer
-    :title="$t('standardSelect.standardSelection')"
-    :maskClosable="false"
-    :width="1000"
-    placement="right"
-    :closable="true"
-    @close="handleCancel"
-    :visible="visible"
-    class="custom-drawer-style">
-    <div class="custom-drawer-style-scroll">
-      <div class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="searchQuery">
-          <a-row :gutter="24">
-            <a-col :sm="8">
-              <a-form-item :label="$t('standardSelect.source')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-dict-select-tag style="width: 100%" v-model="queryParam.source"
-                                   :disabled="disabledSourceSearch"
-                                   :placeholder="$t('pleaseSelect')+$t('standardSelect.source')"
-                                   :triggerChange="false" dictCode="standard_source"/>
-              </a-form-item>
-            </a-col>
-            <a-col :sm="8">
-              <a-form-item :label="$t('standardSelect.standardNumOrName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input :placeholder="$t('pleaseEnter')+$t('standardSelect.standardNumOrName')"
-                         v-model="queryParam.standardNumOrName"></a-input>
-              </a-form-item>
-            </a-col>
-            <div style="float: right;overflow: hidden;margin-right: 41px;margin-bottom: 20px" class="table-page-search-submitButtons">
-              <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
-              <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
-            </div>
-          </a-row>
-        </a-form>
-      </div>
-      <a-table
-        :columns="columns"
-        rowKey="standardNumber"
-        :scroll="{x: 900}"
-        :data-source="dataList"
-        :pagination="ipagination"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-        :loading="loading">
-
-      </a-table>
-    </div>
-
-    <div class="custom-drawer-style-bottom-btn">
-      <a-button @click="handleCancel" >{{$t('cancel')}}</a-button>
-      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-import { getStandardList } from '@/api/api'
-import JDictSelectTag from '../dict/JDictSelectTag'
-
-export default {
-  name: 'StandardModelSelectionModal',
-  components: { JDictSelectTag },
-  props: {
-    source: {
-      type: [String, Number],
-      default: '1'
-    },
-    value: {
-      type: String,
-      default: ''
-    },
-    disabledSourceSearch: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    return {
-      visible: false,
-      confirmLoading: false,
-      labelCol: {
-        sm: 8
-      },
-      wrapperCol: {
-        sm: 14
-      },
-      selectedRowKeys: [],
-      selectedRowList: [],
-      loading: false,
-      queryParam: {},
-      /* 分页参数 */
-      ipagination: {
-        current: 1,
-        pageSize: 10,
-        pageSizeOptions: ['10', '20', '30'],
-        showTotal: (total, range) => {
-          return range[0] + '-' + range[1] + ' ' + this.$t('total') + ' ' + total + ' ' + this.$t('strip')
-        },
-        showQuickJumper: true,
-        showSizeChanger: true,
-        total: 0
-      },
-      columns: [
-        // 标准号
-        {
-          title: this.$t('number'),
-          dataIndex: 'standardNumber',
-          ellipsis: true,
-          align: 'center',
-          width: 150
-        },
-        // 标准名称
-        {
-          title: this.$t('title'),
-          dataIndex: 'standardName',
-          ellipsis: true,
-          align: 'center',
-          width: 150
-        },
-        // 发布日期
-        {
-          title: this.$t('standardSelect.releaseDate'),
-          dataIndex: 'releaseDate',
-          align: 'center',
-          width: 120,
-          scopedSlots: { customRender: 'text' }
-        },
-        // 标准状态
-        {
-          title: this.$t('projectLibrary.vehicleItemLibrary.standardState'),
-          dataIndex: 'standardState_dictText',
-          align: 'center',
-          width: 150
-        }
-      ],
-      dataList: []
-    }
-  },
-  methods: {
-    open () {
-      this.visible = true
-      this.$nextTick(() => {
-        this.source ? this.queryParam.source = this.source : this.queryParam = {}
-        this.replacePage()
-      })
-    },
-    // 获取表格数据
-    replacePage () {
-      const query = {
-        ...this.queryParam,
-        pageNo: this.ipagination.current,
-        pageSize: this.ipagination.pageSize
-      }
-      this.selectedRowKeys = []
-      this.loading = true
-      getStandardList(query).then((res) => {
-        if (res.success) {
-          this.dataList = res.result.records
-          this.ipagination.total = res.result.total
-          this.selectedRowKeys = this.value.split(',')
-        } else {
-          this.dataList = []
-        }
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    searchQuery () {
-      this.replacePage()
-    },
-    searchReset () {
-      this.queryParam = {}
-      this.replacePage()
-    },
-    // 表格选择改变
-    onSelectChange (value, row) {
-      this.selectedRowKeys = value
-      this.selectedRowList = row
-    },
-    handleCancel () {
-      this.visible = false
-    },
-    handleSubmit () {
-      const serialNumber = []
-      const serialNameArr = []
-      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-        this.selectedRowList.forEach(res => {
-          serialNumber.push(res.standardNumber)
-          serialNameArr.push(res.standardName)
-        })
-        this.$emit('change', serialNumber.join(','))
-        this.$emit('nameChange', serialNameArr.join(','))
-        this.visible = false
-      } else {
-        this.$message.warning(this.$t('selectLeastOne'))
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/components/selection/StandardSelection.vue

@@ -1,14 +1,14 @@
 <template>
-  <div>
+  <div class="selection-wrapper">
     <div class="box-title-text">
       <a-input class="box-input" :value="value" :title="value" @input="indexClick($event)"
                :disabled="isDisabled" readonly
-               :placeholder="!isDisabled?$t('pleaseEnterOrSelect')+query.dbFieldTxt:query.dbFieldTxt"/>
+               :placeholder="placeholder"/>
       <a-button v-if="!isDisabled" type="primary" class="button-box" @click="standardClick">
         {{this.$t('standardSelect.standardSelection')}}
       </a-button>
     </div>
-    <standard-selection-modal ref="standardSelectionModal" v-bind="$attrs" :query="query" @input="modalInput" @change="modalChange"></standard-selection-modal>
+    <standard-selection-modal ref="standardSelectionModal" v-bind="$attrs" :value="value" @change="modalInput" @nameChange="modalNameChange"></standard-selection-modal>
   </div>
 </template>
 
@@ -19,27 +19,17 @@ export default {
   name: 'StandardSelection',
   components: { StandardSelectionModal },
   props: {
-    query: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
     value: {
       type: String,
       default: ''
-    }
-  },
-  computed: {
-    isDisabled () {
-      if (this.query.dbFieldName === 'replaced_standard') {
-        return true
-      }
-      return false
-    }
-  },
-  data () {
-    return {
+    },
+    placeholder: {
+      type: String,
+      default: ''
+    },
+    isDisabled: {
+      type: Boolean,
+      default: false
     }
   },
   methods: {
@@ -49,33 +39,37 @@ export default {
     },
     // 输入框输入监听
     indexClick (event) {
-      console.log(event.target.value)
-      this.$emit('input', event.target.value)
+      this.$emit('change', event.target.value)
     },
     modalInput (value) {
-      this.$emit('input', value)
+      this.$emit('change', value)
     },
-    modalChange (fieldName, value) {
-      this.$emit('change', fieldName, value)
+    modalNameChange (value) {
+      this.$emit('nameChange', value)
     }
+  },
+  model: {
+    prop: 'value',
+    event: 'change'
   }
 }
 </script>
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+.selection-wrapper {
+  height: 40px;
+  line-height: 40px;
+}
 .box-title-text {
-  line-height: 1.4;
+  height: 100%;
   display: flex;
+  align-items: center;
   .box-input {
-    display: inline-block;
-    //height: 38px;
     width: 100%;
   }
   .button-box {
     margin-left: 10px;
-    //height: 38px;
-    //line-height: 38px;
   }
 }
 </style>

src/components/selection/StandardSelectionModal.vue

@@ -11,26 +11,27 @@
     <div class="custom-drawer-style-scroll">
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :sm="8">
-            <a-form-item :label="$t('standardSelect.source')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag style="width: 100%" v-model="queryParam.source"
-                                 :placeholder="$t('pleaseSelect')+$t('standardSelect.source')"
-                                 :triggerChange="false" dictCode="standard_source"/>
-            </a-form-item>
-          </a-col>
-          <a-col :sm="8">
-            <a-form-item :label="$t('standardSelect.standardNumOrName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('standardSelect.standardNumOrName')"
-                       v-model="queryParam.standardNumOrName"></a-input>
-            </a-form-item>
-          </a-col>
-          <div style="float: right;overflow: hidden;margin-right: 41px;margin-bottom: 20px" class="table-page-search-submitButtons">
-            <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
-            <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
-          </div>
-        </a-row>
-      </a-form>
+          <a-row :gutter="24">
+            <a-col :sm="8">
+              <a-form-item :label="$t('standardSelect.source')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-dict-select-tag style="width: 100%" v-model="queryParam.source"
+                                   :disabled="disabledSourceSearch"
+                                   :placeholder="$t('pleaseSelect')+$t('standardSelect.source')"
+                                   :triggerChange="false" dictCode="standard_source"/>
+              </a-form-item>
+            </a-col>
+            <a-col :sm="8">
+              <a-form-item :label="$t('standardSelect.standardNumOrName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input :placeholder="$t('pleaseEnter')+$t('standardSelect.standardNumOrName')"
+                         v-model="queryParam.standardNumOrName"></a-input>
+              </a-form-item>
+            </a-col>
+            <div style="float: right;overflow: hidden;margin-right: 41px;margin-bottom: 20px" class="table-page-search-submitButtons">
+              <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+              <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+            </div>
+          </a-row>
+        </a-form>
       </div>
       <a-table
         :columns="columns"
@@ -59,21 +60,18 @@ export default {
   name: 'StandardSelectionModal',
   components: { JDictSelectTag },
   props: {
-    query: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    standard: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
     source: {
       type: [String, Number],
       default: '1'
+    },
+    value: {
+      type: String,
+      default: ''
+    },
+    // 搜索条件中的来源是否不可更改
+    disabledSourceSearch: {
+      type: Boolean,
+      default: false
     }
   },
   data () {
@@ -117,6 +115,14 @@ export default {
           align: 'center',
           width: 150
         },
+        // 发布日期
+        {
+          title: this.$t('standardSelect.releaseDate'),
+          dataIndex: 'releaseDate',
+          align: 'center',
+          width: 120,
+          scopedSlots: { customRender: 'text' }
+        },
         {
           title: this.$t('standardSelect.textState'),
           dataIndex: 'standardState_dictText',
@@ -149,7 +155,7 @@ export default {
         if (res.success) {
           this.dataList = res.result.records
           this.ipagination.total = res.result.total
-          this.selectedRowKeys = this.standard[this.query.dbFieldName] ? this.standard[this.query.dbFieldName].split(',') : []
+          this.selectedRowKeys = this.value.split(',')
         } else {
           this.dataList = []
         }
@@ -174,16 +180,14 @@ export default {
     },
     handleSubmit () {
       const serialNumber = []
-      const replaceStandardId = []
+      const serialNameArr = []
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-        // let content = JSON.parse(JSON.stringify(this.selectedRowList))
         this.selectedRowList.forEach(res => {
           serialNumber.push(res.standardNumber)
-          replaceStandardId.push(res.id)
+          serialNameArr.push(res.standardName)
         })
-        this.$emit('input', serialNumber.join(','))
-        this.$emit('change', this.query.dbFieldName, replaceStandardId.join(','))
-        // this.$emit('changecontent', this.content)
+        this.$emit('change', serialNumber.join(','))
+        this.$emit('nameChange', serialNameArr.join(','))
         this.visible = false
       } else {
         this.$message.warning(this.$t('selectLeastOne'))