From 28956c03969d88df1ccb7b37f577607d4a8c7715 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 08 十一月 2022 14:41:32 +0800
Subject: [PATCH] 1.工艺路线、节拍工价优化
---
src/views/zzmx/gylx.vue | 55 ++++++++++++++++++++++++---
src/views/zzmx/jpgj.vue | 8 ++++
vue.config.js | 4 +-
3 files changed, 58 insertions(+), 9 deletions(-)
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index 832913d..7df18bb 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -125,7 +125,10 @@
/>
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" @click="del(row)" />
+ <i class="el-icon-delete" style="margin-right:15px;" @click="del(row)" />
+ </el-tooltip>
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="澶嶅埗" placement="top">
+ <i class="el-icon-document-copy" style="cursor: pointer;color:#42b983" @click="copy('copy',row)" />
</el-tooltip>
</div>
</template>
@@ -145,7 +148,7 @@
</div>
<el-dialog
- :title="operation==='add'?'鏂板':'棰勮'"
+ :title="operation==='add'?'鏂板':(operation==='edit'?'棰勮':'澶嶅埗')"
:visible.sync="dialogVisible"
width="1000px"
:close-on-click-modal="false"
@@ -156,7 +159,7 @@
<el-form ref="dialogForm" style="height: 500px" :rules="dialogFormRules" :model="dialogForm" label-width="110px">
<div style="display: flex">
<el-form-item label="宸ヨ壓璺嚎缂栫爜" prop="code" style="margin-right: 20px">
- <el-input v-model="dialogForm.code" :disabled="operation!=='add'" style="width: 220px" />
+ <el-input v-model="dialogForm.code" :disabled="operation==='edit'" style="width: 220px" />
</el-form-item>
<el-form-item label="宸ヨ壓鍚嶇О" prop="name">
<el-input v-model="dialogForm.name" :disabled="operation==='edit'" style="width: 220px" />
@@ -346,7 +349,7 @@
routeArr: [], // 宸ヨ壓璁剧疆涓嬫媺鎵�鏈夊��
routeSelectedArr: [], // 宸ヨ壓璁剧疆涓嬫媺宸查�夌殑鍊�
addDisabled: true, // 娣诲姞鎸夐挳鏄惁鍙偣鍑�
- editDisabled: true, // 淇敼鎸夐挳鏄惁鍙偣鍑�
+ // editDisabled: true, // 淇敼鎸夐挳鏄惁鍙偣鍑�
mouseFocusPosition: 0, // 榧犳爣鑱氱劍鐨勪綅缃�
operation: '',
dialogFormRules: {
@@ -444,6 +447,7 @@
stepname: item.stepname,
value: item.value
})
+ console.log(this.routeSelectedArr, 7)
this.routeArr.splice(index, 1)
}
})
@@ -685,6 +689,43 @@
this.$message.info('宸插彇娑堝垹闄�')
})
},
+ // 澶嶅埗鎸夐挳
+ async copy(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+
+ await this.getStepSelectArr()
+ const { data: res } = await ViewRoute({ routecode: row.code })
+ // 寰呮敼
+ this.dynamicTags = []
+ this.routeSelectedArr = []
+ this.$nextTick(() => {
+ this.dialogForm.code = res[0].code
+ this.dialogForm.name = res[0].name
+ this.dialogForm.enable = res[0].enable
+ this.dialogForm.description = res[0].description
+ // this.dialogForm.Data = row.description
+ res[0].Data.forEach(item => {
+ this.dynamicTags.push(
+ { seq: item.seq, stepname: item.stepname, stepcode: item.stepcode, editDisabled: true, effect: 'light' }
+ )
+ this.routeSelectedArr.push({
+ stepcode: item.stepcode,
+ stepname: item.stepname,
+ value: item.stepname
+ })
+
+ console.log(item, 2)
+ console.log(this.routeArr)
+
+ this.routeArr = this.routeArr.filter(i => i.stepcode !== item.stepcode)
+ })
+
+ this.addDisabled = false
+
+ // { editDisabled: true, stepcode: '', seq: 1, stepname: ' ', effect: 'light' }
+ })
+ },
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
this.dialogForm.code = ''
@@ -731,14 +772,14 @@
Data: Data
}
- AddUpdateRoute(this.dialogForm.id, this.operation === 'add' ? 'Add' : 'Update', data).then(res => {
+ AddUpdateRoute(this.dialogForm.id, this.operation === 'edit' ? 'Update' : 'Add', data).then(res => {
if (res.code === '200') {
this.dialogVisible = false
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '澶嶅埗鎴愬姛锛�')
this.getRouteSearch()
this.$store.state.app.buttonIsDisabled = false
} else {
- this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '澶嶅埗澶辫触锛�')
}
})
}
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index a506c91..21bd725 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -714,6 +714,14 @@
editRow(row) {
if (this.isEqpTableEdit) {
row.isVisible = 1
+ let temp = {}
+ this.eqpDialogArr.forEach((item, index) => {
+ if (row.eqpcode === item.eqpcode) {
+ temp = item
+ this.eqpDialogArr.splice(index, 1, temp)
+ this.eqpDialogArr[index].isVisible = 1
+ }
+ })
this.isEqpTableEdit = false
} else {
return this.$message.info('鍙兘涓�琛屼竴琛屼慨鏀癸紒')
diff --git a/vue.config.js b/vue.config.js
index fa82be2..c41496a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -50,8 +50,8 @@
},
proxy: {
[process.env.VUE_APP_BASE_API]: {
- target: 'http://121.196.36.24:8003', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴鏈嶅姟鍣�(澶у矝)
- // target: 'http://192.168.2.138:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(澶у矝)
+ target: 'http://121.196.36.24:8003', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴鏈嶅姟鍣�(鐏电繑)
+ // target: 'http://192.168.2.138:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(鐏电繑)
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
['^' + process.env.VUE_APP_BASE_API]: '/api/'
--
Gitblit v1.9.3