From 84ebff320cdf6844adf1202c3c856e225c38b730 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期二, 28 五月 2024 12:00:29 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/configuration/custom/addField.vue | 185 ++--------------------------------------------
1 files changed, 8 insertions(+), 177 deletions(-)
diff --git a/src/views/configuration/custom/addField.vue b/src/views/configuration/custom/addField.vue
index cb570dd..a0fe49c 100644
--- a/src/views/configuration/custom/addField.vue
+++ b/src/views/configuration/custom/addField.vue
@@ -4,12 +4,12 @@
<el-row>
<el-col :span="24">
<el-form-item label="瀛楁鍚嶇О" prop="code">
- <el-input v-model="addFieldForm.code" placeholder="杈撳叆涓�涓鍚堥槄璇讳範鎯殑绠�鐭悕绉帮紝寤鸿4涓瓧绗︼紝鏈�澶氫笉瓒呰繃12瀛�" clearable></el-input>
+ <el-input v-model="addFieldForm.test" placeholder="杈撳叆涓�涓鍚堥槄璇讳範鎯殑绠�鐭悕绉帮紝寤鸿4涓瓧绗︼紝鏈�澶氫笉瓒呰繃12瀛�" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="鎻愮ず鏂囧瓧" prop="dictValue">
- <el-input v-model="addFieldForm.dictValue" placeholder="鎻忚堪鎻愮ず鐢ㄦ埛濡備綍濉啓瀛楁鍊硷紙渚嬪锛氳杈撳叆鍚嶅瓧锛�" clearable></el-input>
+ <el-form-item label="鎻愮ず鏂囧瓧">
+ <el-input v-model="addFieldForm.test" placeholder="鎻忚堪鎻愮ず鐢ㄦ埛濡備綍濉啓瀛楁鍊硷紙渚嬪锛氳杈撳叆鍚嶅瓧锛�" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
@@ -19,131 +19,14 @@
</el-select>
</el-form-item>
</el-col>
- <!-- 鍙橀噺1 杈撳叆妗� -->
- <el-col :span="24">
- <el-form-item label="榛樿鍊�">
- <el-input v-model="addFieldForm.dictValue" placeholder="绯荤粺榛樿鎻愪緵鐨勫�硷紝鍙笉濉紝璁剧疆榛樿鍊间細鏇挎崲鎻愮ず鏂囧瓧" clearable></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="鏂囧瓧闀垮害">
- <el-date-picker v-model="addFieldForm.num" style="width: 100%" type="date" placeholder="璇疯緭鍏ユ枃瀛楁渶闀块檺鍒跺瓧鏁�"></el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="杈撳叆鏍煎紡">
- <el-select v-model="addFieldForm.test" style="width: 100%" @change="deptIdChange" placeholder="閫夋嫨杈撳叆妗嗕笉鍚岀殑杈撳叆鏍煎紡">
- <el-option v-for="item in inputTypeList" :key="item.id" :label="item.title" :value="item.id"/>
- </el-select>
- </el-form-item>
- </el-col>
- <!-- 鍙橀噺2 鏁板瓧杈撳叆妗�-->
- <el-col :span="24">
- <el-form-item label="榛樿鍊�">
- <el-input-number v-model="addFieldForm.num" @change="handleChange" :min="1" :max="10" label="绯荤粺榛樿鎻愪緵鐨勫�硷紝鍙笉濉紝璁剧疆榛樿鍊间細鏇挎崲鎻愮ず鏂囧瓧"></el-input-number>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="鏍煎紡">
- <el-radio v-model="addFieldForm.radio" label="1">鏁板��</el-radio>
- <el-radio v-model="addFieldForm.radio" label="2">鐧惧垎姣�</el-radio>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="淇濈暀灏忔暟浣�">
- <el-input-number v-model="addFieldForm.num" @change="handleChange" :min="1" :max="10" label="鏈�澶氫笉瓒呰繃4浣嶅皬鏁�"></el-input-number>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="鏄剧ず鍗冨垎绗�">
- <el-checkbox v-model="addFieldForm.check"></el-checkbox>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="闄愬畾鍊艰寖鍥�">
- <el-input-number v-model="addFieldForm.num" @change="handleChange" :min="1" :max="10"></el-input-number>
- <span>-</span>
- <el-input-number v-model="addFieldForm.num" @change="handleChange" :min="1" :max="10"></el-input-number>
- </el-form-item>
- </el-col>
- <!-- 鍙橀噺3 澶氳鏂囨湰-->
- <el-col :span="24">
- <el-form-item label="榛樿鍊�">
- <el-input v-model="addFieldForm.test" placeholder="绯荤粺榛樿鎻愪緵鐨勫�硷紝鍙笉濉紝璁剧疆榛樿鍊间細鏇挎崲鎻愮ず鏂囧瓧" clearable></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="鏂囧瓧闀垮害">
- <el-input-number v-model="addFieldForm.num" @change="handleChange" :min="1" :max="10" label="璇疯緭鍏ユ枃瀛楁渶闀块檺鍒跺瓧鏁�"></el-input-number>
- </el-form-item>
- </el-col>
- <!-- 鍙橀噺4 鏃ユ湡閫夋嫨鍣�-->
- <el-col :span="24">
- <el-form-item label="榛樿鍊�">
- <el-date-picker v-model="addFieldForm.test" style="width: 100%" type="date" placeholder="绯荤粺榛樿鎻愪緵鐨勫�硷紝鍙笉濉紝璁剧疆榛樿鍊间細鏇挎崲鎻愮ず鏂囧瓧"></el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="鏃ユ湡鏍煎紡" prop="deptId">
- <el-select v-model="addFieldForm.test" style="width: 100%" @change="deptIdChange" placeholder="璇疯緭鍏ユ枃瀛楁渶闀块檺鍒跺瓧鏁�">
- <el-option v-for="item in dateFormatList" :key="item.id" :label="item.title" :value="item.id"/>
- </el-select>
- </el-form-item>
- </el-col>
- <!-- 鍙橀噺5 鍗曢�夋寜閽�-->
- <el-col :span="24">
- <el-form-item label="閫夐」">
- <div>
- <el-radio v-model="addFieldForm.radio" label="1"></el-radio>
- <el-input v-model="addFieldForm.test" clearable></el-input>
- <span class="remove-btn">鍒犻櫎</span>
- </div>
- <div class="add-btn">娣诲姞閫夐」</div>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="鎺掑簭鏂瑰紡">
- <el-radio v-model="addFieldForm.radio" label="1">妯悜鎺掑垪</el-radio>
- <el-radio v-model="addFieldForm.radio" label="2">绾靛悜鎺掑垪</el-radio>
- </el-form-item>
- </el-col>
- <!-- 鍙橀噺6 澶氶�夋寜閽�-->
- <el-col :span="24">
- <el-form-item label="閫夐」">
- <div>
- <el-checkbox v-model="addFieldForm.check"></el-checkbox>
- <el-input v-model="addFieldForm.test" clearable></el-input>
- <span class="remove-btn">鍒犻櫎</span>
- </div>
- <div class="add-btn">娣诲姞閫夐」</div>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="鎺掑簭鏂瑰紡">
- <el-radio v-model="addFieldForm.radio" label="1">妯悜鎺掑垪</el-radio>
- <el-radio v-model="addFieldForm.radio" label="2">绾靛悜鎺掑垪</el-radio>
- </el-form-item>
- </el-col>
- <!-- 鍙橀噺7 涓嬫媺閫夋嫨鍣�-->
- <el-col :span="24">
- <el-form-item label="閫夐」">
- <div>
- <el-input v-model="addFieldForm.test" clearable></el-input>
- <span class="remove-btn">鍒犻櫎</span>
- </div>
- <div class="add-btn">娣诲姞閫夐」</div>
- </el-form-item>
- </el-col>
- <!-- 鍙橀噺8 涓氬姟瀛楁-浜哄憳-->
- <!-- 娌℃湁 -->
<el-col :span="24">
<el-form-item label="缂栬緫椤垫樉绀�">
- <el-checkbox v-model="addFieldForm.check">鏄剧ず</el-checkbox>
+ <el-checkbox v-model="addFieldForm.test" disabled></el-checkbox>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="鏌ョ湅椤垫樉绀�">
- <el-checkbox v-model="addFieldForm.check">鏄剧ず</el-checkbox>
+ <el-checkbox v-model="addFieldForm.test" disabled></el-checkbox>
</el-form-item>
</el-col>
</el-row>
@@ -151,7 +34,6 @@
<template #footer>
<el-button @click="visible=false" >鍙� 娑�</el-button>
<el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="fieldSubmit">淇濆瓨</el-button>
- <el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="fieldSubmitAgain">淇濆瓨骞剁户缁坊鍔�</el-button>
</template>
</el-dialog>
</template>
@@ -161,30 +43,6 @@
emits: ['success', 'closed'],
data() {
return {
- inputTypeList: [ //杈撳叆鏍煎紡
- {title: "鏃�",id:1},
- {title: "鎵嬫満鍙风爜",id:1},
- {title: "鐢佃瘽鍙风爜",id:1},
- {title: "閭",id:1}
- ],
- fieldTypeList: [ //瀛楁绫诲瀷
- {title: "杈撳叆妗�",id:1},
- {title: "鏁板瓧杈撳叆妗�",id:2},
- {title: "澶氳鏂囨湰",id:3},
- {title: "鏃ユ湡閫夋嫨鍣�",id:4},
- {title: "鍗曢�夋寜閽�",id:5},
- {title: "澶氶�夋寜閽�",id:6},
- {title: "涓嬫媺閫夋嫨鍣�",id:7},
- {title: "涓氬姟瀛楁-浜哄憳",id:8},
- {title: "榛樿",id:9}
- ],
- dateFormatList: [ //鏃ユ湡鏍煎紡
- {title: "骞�-鏈�",id:1},
- {title: "骞�-鏈�-鏃�",id:2},
- {title: "骞�-鏈�-鏃� 鏃讹細鍒�",id:3},
- {title: "骞�-鏈�-鏃� 鏃讹細鍒嗭細绉�",id:4}
- ],
- deptIdList: [],
mode: "add",
titleMap: {
add: '娣诲姞鑷畾涔夊瓧娈�',
@@ -195,17 +53,7 @@
isSaveing: false,
//琛ㄥ崟鏁版嵁
addFieldForm: {
- radio: '1',
- num: 0,
- test: "",
- check: false,
- code: "",
- dictValue: "",
- sort: "",
- isSealed: false,
- remark: "",
- dictKey: "-1",
- $isSealed: "鍚�"
+ test: ""
},
//楠岃瘉瑙勫垯
addFieldRules: {
@@ -256,33 +104,16 @@
}
})
},
- fieldSubmitAgain() {
-
- },
//琛ㄥ崟娉ㄥ叆鏁版嵁
setData(data){
console.log(data)
//鍙互鍜屼笂闈竴鏍峰崟涓敞鍏ワ紝涔熷彲浠ュ儚涓嬮潰涓�鏍风洿鎺ュ悎骞惰繘鍘�
- if(data.isSealed == "1") {
- data.isSealed = true;
- }else {
- data.isSealed = false;
- }
- Object.assign(this.addFieldForm, data);
+ //Object.assign(this.addFieldForm, data);
}
}
}
</script>
<style scoped>
-.remove-btn {
- margin-left: 10px;
- color: red;
- cursor: pointer;
-}
-.add-btn {
- margin-left: 30px;
- color: #3b8e8e;
- cursor: pointer;
-}
+
</style>
--
Gitblit v1.9.3