|  | @@ -43,10 +43,15 @@
 | 
	
		
			
				|  |  |                      <template slot-scope="{type,disabled}" slot="fieldValueNewNameForm">
 | 
	
		
			
				|  |  |                          <el-input v-if="rowFrom.fieldValueType == '输入框'" :disabled="disabled"
 | 
	
		
			
				|  |  |                              v-model="rowFrom.fieldValueNewName"></el-input>
 | 
	
		
			
				|  |  | -                        <dic-select v-if="rowFrom.fieldValueType == '选择器'" v-model="rowFrom.fieldValueNewName" key="id"
 | 
	
		
			
				|  |  | -                            res="records" :label="rowFrom.fieldValueRetrieval" :url="rowFrom.fieldValueUrl"
 | 
	
		
			
				|  |  | -                            :filterable="true" :remote="true" :dataName="rowFrom.fieldValueRetrieval" placeholder=""
 | 
	
		
			
				|  |  | +                        <dic-select v-if="rowFrom.fieldValueType == '选择器' && rowFrom.queryType != '字典'"
 | 
	
		
			
				|  |  | +                            v-model="rowFrom.fieldValueNewName" key="id" res="records"
 | 
	
		
			
				|  |  | +                            :label="rowFrom.fieldValueRetrieval" :url="rowFrom.fieldValueUrl" :filterable="true"
 | 
	
		
			
				|  |  | +                            :remote="true" :dataName="rowFrom.fieldValueRetrieval" placeholder=""
 | 
	
		
			
				|  |  |                              @selectChange="dicChange(rowFrom.fieldValueNewName, $event)"></dic-select>
 | 
	
		
			
				|  |  | +                        <dic-select v-if="rowFrom.fieldValueType == '选择器' && rowFrom.queryType == '字典'"
 | 
	
		
			
				|  |  | +                            v-model="rowFrom.fieldValueNewName" key="id" label="dictValue" keyValue="dictKey"
 | 
	
		
			
				|  |  | +                            :url="rowFrom.fieldValueUrl" placeholder=""
 | 
	
		
			
				|  |  | +                            @selectChange="dicChange('字典', $event)"></dic-select>
 | 
	
		
			
				|  |  |                      </template>
 | 
	
		
			
				|  |  |                  </avue-crud>
 | 
	
		
			
				|  |  |              </trade-card>
 | 
	
	
		
			
				|  | @@ -173,10 +178,8 @@ export default {
 | 
	
		
			
				|  |  |                  delBtn: false,
 | 
	
		
			
				|  |  |                  refreshBtn: false,
 | 
	
		
			
				|  |  |                  selection: true,
 | 
	
		
			
				|  |  | -                selectionFixed: false,
 | 
	
		
			
				|  |  |                  align: 'center',
 | 
	
		
			
				|  |  |                  index: true,
 | 
	
		
			
				|  |  | -                indexFixed: false,
 | 
	
		
			
				|  |  |                  column: [
 | 
	
		
			
				|  |  |                      {
 | 
	
		
			
				|  |  |                          label: "更改时间",
 | 
	
	
		
			
				|  | @@ -286,12 +289,23 @@ export default {
 | 
	
		
			
				|  |  |              });
 | 
	
		
			
				|  |  |          },
 | 
	
		
			
				|  |  |          dicChange(name, row) {
 | 
	
		
			
				|  |  | -            if (row) {
 | 
	
		
			
				|  |  | -                this.rowFrom.fieldValueNew = row.id
 | 
	
		
			
				|  |  | -                this.rowFrom.fieldValueNewName = row.cnName
 | 
	
		
			
				|  |  | -            } else {
 | 
	
		
			
				|  |  | -                this.rowFrom.fieldValueNew = null
 | 
	
		
			
				|  |  | -                this.rowFrom.fieldValueNewName = null
 | 
	
		
			
				|  |  | +            if (!name) {
 | 
	
		
			
				|  |  | +                if (row) {
 | 
	
		
			
				|  |  | +                    this.rowFrom.fieldValueNew = row.id
 | 
	
		
			
				|  |  | +                    this.rowFrom.fieldValueNewName = row.cnName
 | 
	
		
			
				|  |  | +                } else {
 | 
	
		
			
				|  |  | +                    this.rowFrom.fieldValueNew = null
 | 
	
		
			
				|  |  | +                    this.rowFrom.fieldValueNewName = null
 | 
	
		
			
				|  |  | +                }
 | 
	
		
			
				|  |  | +            }
 | 
	
		
			
				|  |  | +            if (name == '字典') {
 | 
	
		
			
				|  |  | +                if (row) {
 | 
	
		
			
				|  |  | +                    this.rowFrom.fieldValueNew = row.dictKey
 | 
	
		
			
				|  |  | +                    this.rowFrom.fieldValueNewName = row.dictValue
 | 
	
		
			
				|  |  | +                } else {
 | 
	
		
			
				|  |  | +                    this.rowFrom.fieldValueNew = null
 | 
	
		
			
				|  |  | +                    this.rowFrom.fieldValueNewName = null
 | 
	
		
			
				|  |  | +                }
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |          },
 | 
	
		
			
				|  |  |          rowDel(row, index) {
 |