From 0ec37c12c269d6f824da6d13e47c38e04757909b Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期六, 13 四月 2024 22:17:13 +0800
Subject: [PATCH] update
---
src/views/console/workstation/Dialog.vue | 188 ++++++++++++++++++++++++++++------------------
1 files changed, 113 insertions(+), 75 deletions(-)
diff --git a/src/views/console/workstation/Dialog.vue b/src/views/console/workstation/Dialog.vue
index 5295498..effd650 100644
--- a/src/views/console/workstation/Dialog.vue
+++ b/src/views/console/workstation/Dialog.vue
@@ -7,107 +7,123 @@
鍩虹淇℃伅
</el-col>
<el-col :span="12">
- <el-form-item label="宸ュ彿" prop="userName">
- <el-input v-model="form.userName" placeholder="鐢ㄤ簬鐧诲綍绯荤粺" clearable></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
<el-form-item label="宸ヤ綅缂栧彿" prop="userName">
- <el-input v-model="form.userName" placeholder="鐢ㄤ簬鐧诲綍绯荤粺" clearable></el-input>
+ <el-input style="width: 240px" v-model="form.userName" placeholder="宸ヤ綅缂栧彿" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="宸ヤ綅鍚嶇О" prop="userName">
- <el-input v-model="form.userName" placeholder="鐢ㄤ簬鐧诲綍绯荤粺" clearable></el-input>
+ <el-input style="width: 240px" v-model="form.userName" placeholder="宸ヤ綅鍚嶇О" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="宸ヤ綅绫诲瀷" prop="userName">
- <el-input v-model="form.userName" placeholder="鐢ㄤ簬鐧诲綍绯荤粺" clearable></el-input>
+ <el-select v-model="type" style="width: 240px">
+ <el-option v-for="item in options.types" :key="item.value" :label="item.label"
+ :value="item.value" />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鎵�灞炲伐浣嶇粍" prop="userName">
- <el-input v-model="form.userName" placeholder="鐢ㄤ簬鐧诲綍绯荤粺" clearable></el-input>
+ <el-tree-select v-model="form.userName" :data="options.group" :render-after-expand="false"
+ style="width: 240px" />
+ <!-- <el-select v-model="type" style="width: 240px">
+ <el-option v-for="item in options" :key="item.value" :label="item.label"
+ :value="item.value" />
+ </el-select> -->
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鐘舵��" prop="userName">
- <el-input v-model="form.userName" placeholder="鐢ㄤ簬鐧诲綍绯荤粺" clearable></el-input>
+ <el-select v-model="type" style="width: 240px">
+ <el-option v-for="item in options.status" :key="item.value" :label="item.label"
+ :value="item.value" />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="澶村儚" prop="avatar">
- <sc-upload v-model="form.avatar" title="涓婁紶澶村儚"></sc-upload>
+ <el-form-item label="宸ヤ綅鍥剧墖" prop="avatar">
+ <sc-upload v-model="form.avatar" title="宸ヤ綅鍥剧墖"></sc-upload>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐢熶骇鏃ュ巻" prop="userName">
+ <el-select v-model="type" style="width: 240px">
+ <el-option v-for="item in options.calendarList" :key="item.id" :label="item.name"
+ :value="item.id" />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="24" style="padding:12px 0;">
鏈哄櫒淇℃伅
</el-col>
-
+
<el-col :span="12">
- <el-form-item label="宸ュ彿" prop="userName">
- <el-input v-model="form.userName" placeholder="鐢ㄤ簬鐧诲綍绯荤粺" clearable></el-input>
+ <el-form-item label="閫夋嫨鏈哄櫒" prop="userName">
+ <!-- <el-select v-model="type" style="width: 240px">
+ <el-option v-for="item in options.linkWays" :key="item.value" :label="item.label"
+ :value="item.value" />
+ </el-select> -->
+ <el-radio-group v-model="form.userName">
+ <el-radio v-for="item in options.linkWays" :key="item.value" :value="item.value">{{item.label}}</el-radio>
+ </el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="濮撳悕" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ュ畬鏁寸殑鐪熷疄濮撳悕" clearable></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鎵嬫満鍙�" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ユ墜鏈哄彿" clearable></el-input>
+ <el-form-item label="鏈哄櫒缂栧彿" prop="userName">
+ <el-input style="width: 240px" v-model="form.userName" placeholder="鏈哄櫒缂栧彿" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="24" style="padding:12px 0;">
鎵╁睍淇℃伅
</el-col>
<el-col :span="12">
- <el-form-item label="鐘舵��" prop="name">
- <el-select v-model="form.group" multiple filterable style="width: 100%">
- <el-option v-for="item in groups" :key="item.id" :label="item.label" :value="item.id" />
+ <el-form-item label="宸ョ" prop="userName">
+ <el-select v-model="type" style="width: 240px">
+ <el-option v-for="item in options.work_type" :key="item.dictKey" :label="item.dictValue"
+ :value="item.dictKey" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="宀椾綅" prop="dept">
- <el-select v-model="form.group" multiple filterable style="width: 100%">
- <el-option v-for="item in groups" :key="item.id" :label="item.label" :value="item.id" />
+ <el-form-item label="鍔犲伐灞炴��" prop="userName">
+ <el-select v-model="type" style="width: 240px">
+ <el-option v-for="item in options.machining_type" :key="item.dictKey" :label="item.dictValue"
+ :value="item.dictKey" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閭" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ラ偖绠�" clearable></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="閮ㄩ棬" prop="dept">
- <el-select v-model="form.group" multiple filterable style="width: 100%">
- <el-option v-for="item in groups" :key="item.id" :label="item.label" :value="item.id" />
+ <el-form-item label="绋嬪簭浼犺緭鏂瑰紡" prop="userName">
+ <el-select v-model="type" style="width: 240px">
+ <el-option label="FTP" value="1" />
+ <el-option label="涓插彛" value="" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="PIN鐮�" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏IN鐮�" clearable></el-input>
+ <el-form-item label="FTP鐩綍" prop="userName">
+ <el-select v-model="type" style="width: 240px">
+ <el-option v-for="item in options" :key="item.value" :label="item.label"
+ :value="item.value" />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍏ヨ亴鏃堕棿" prop="name">
- <el-date-picker style="width: 100%;" v-model="value1" type="date" placeholder="Pick a day"
- :size="size" />
+ <el-form-item label="宸ヤ綔鍙�" prop="userName">
+ <el-select v-model="type" style="width: 240px">
+ <el-option v-for="item in options" :key="item.value" :label="item.label"
+ :value="item.value" />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍏宠仈璐﹀彿" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ュ叧鑱旇处鍙�" clearable></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鏁版嵁鏉冮檺閰嶇疆" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ユ暟鎹潈闄愰厤缃�" clearable></el-input>
+ <el-form-item label="鏁版嵁鏉冮檺" prop="userName">
+ <el-select v-model="type" style="width: 240px">
+ <el-option v-for="item in options" :key="item.value" :label="item.label"
+ :value="item.value" />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -120,16 +136,38 @@
</template>
<script>
+import deepmerge from 'deepmerge'
+import http from "@/utils/request"
export default {
emits: ['success', 'closed'],
+ props: {
+ option: {
+ type: Object
+ }
+ },
+ computed: {
+ options() {
+ let group = deepmerge([], this.option.group)
+ group[0].disabled = true
+ return {
+ ...this.option,
+ group,
+ calendarList: this.calendarList,
+ linkWays: this.linkWays,
+ work_type: this.work_type,
+ machining_type: this.machining_type
+ }
+ }
+ },
data() {
return {
mode: "add",
titleMap: {
- add: '娣诲姞鍛樺伐',
- edit: '淇敼鍛樺伐',
- show: '鏌ョ湅'
+ add: '鏂板缓宸ヤ綅',
+ edit: '缂栬緫宸ヤ綅',
+ // show: '鏌ョ湅'
},
+ params: {},
visible: false,
isSaveing: false,
//琛ㄥ崟鏁版嵁
@@ -183,38 +221,38 @@
]
},
//鎵�闇�鏁版嵁閫夐」
- groups: [],
- groupsProps: {
- value: "id",
- multiple: true,
- checkStrictly: true
- },
- depts: [],
- deptsProps: {
- value: "id",
- checkStrictly: true
- }
+ calendarList: [],
+ work_type: [],
+ machining_type: [],
+ linkWays: [
+ {
+ label: '鍏宠仈鏈哄櫒',
+ value: '0'
+ }, {
+ label: '鍒涘缓鍚屽悕鏈哄櫒',
+ value: '1'
+ }
+ ]
}
},
- mounted() {
- // this.getGroup()
- // this.getDept()
+ created() {
+ this.$API.workstation.calendarList.get().then(res => {
+ this.calendarList = res.data
+ })
+ this.$API.system.dic.getDic.get({ code: 'work_type' }).then(res => {
+ this.work_type = res.data
+ })
+ this.$API.system.dic.getDic.get({ code: 'machining_type' }).then(res => {
+ this.machining_type = res.data
+ })
},
methods: {
//鏄剧ず
- open(mode = 'add') {
+ open(mode = 'add', params) {
this.mode = mode;
this.visible = true;
+ this.params = params
return this
- },
- //鍔犺浇鏍戞暟鎹�
- async getGroup() {
- var res = await this.$API.system.role.list.get();
- this.groups = res.data.rows;
- },
- async getDept() {
- var res = await this.$API.system.dept.list.get();
- this.depts = res.data;
},
//琛ㄥ崟鎻愪氦鏂规硶
submit() {
--
Gitblit v1.9.3