From ed892500022adbfa8da4bcb5982079533b22a58a Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 09 十一月 2022 14:01:58 +0800
Subject: [PATCH] 1.生产开报工新增生产类型
---
src/views/scgl/scdd.vue | 6 ++
src/views/scgl/gd.vue | 4 +
src/views/zzmx/jpgj.vue | 22 ++++++++--
vue.config.js | 2
src/views/scgl/sckbg.vue | 38 ++++++++++++++++++-
src/layout/components/Sidebar/index.vue | 3 +
6 files changed, 65 insertions(+), 10 deletions(-)
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index b66020e..727bd6d 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -152,4 +152,7 @@
color: #ffffff;
cursor: default;
}
+.el-menu{
+ background-color: #213145 !important;
+}
</style>
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 3cfd626..c0bc767 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -146,8 +146,9 @@
v-model="radioSelected"
:label="row.wo_code"
style="color: transparent;padding-left: 10px;"
- @change.native="getCurrentRow(row.wo_code)"
+
/>
+<!-- @change.native="getCurrentRow(row.wo_code)"-->
</template>
</el-table-column>
<el-table-column
@@ -2528,6 +2529,7 @@
async rowClick(row, event, column) {
console.log(row, event, column)
console.log(row.wo_code, event, column)
+ this.radioSelected = row.wo_code
const { data: res } = await SearchWorkStep({ wo_code: row.wo_code })
this.tableDataDetail = res
},
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index a744515..18b0ff6 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -135,6 +135,7 @@
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
+ @row-click="rowClick"
>
<!-- <el-table-column-->
<!-- type="selection"-->
@@ -149,8 +150,8 @@
v-model="radioSelectedId"
:label="row.id"
style="color: transparent;padding-left: 10px;"
- @change.native="getCurrentRow(row.id)"
/>
+ <!-- @change.native="getCurrentRow(row.id)"-->
</template>
</el-table-column>
<el-table-column
@@ -587,6 +588,9 @@
getCurrentRow(id) {
this.radioSelectedId = id
},
+ rowClick(row) {
+ this.radioSelectedId = row.id
+ },
// 璁㈠崟鍏抽棴
async orderClose() {
if (this.radioSelectedId.length < 1) {
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 69996f0..6107924 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -563,7 +563,22 @@
<el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嬮亾宸ュ簭锛�">
<div style="width: 200px">{{ dialogForm.nextstepname }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" prop="usergroupcode" label="鐢熶骇鐝粍锛�">
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" prop="productionType" label="鐢熶骇绫诲瀷锛�">
+ <el-select
+ v-model="dialogForm.productionType"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ @change="usergroupChange111"
+ >
+ <el-option
+ v-for="item in productionTypeSelect"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" :prop="dialogForm.productionType==='personal'?'':'usergroupcode'" label="鐢熶骇鐝粍锛�">
<el-select
v-model="dialogForm.usergroupcode"
style="width: 200px;"
@@ -1254,9 +1269,14 @@
startqtySum: '', // 涓嶈兘瓒呰繃鐨勬暟鍊�
operation: getCookie('navTabId'), // 鎶ュ伐浜猴紙鏀舵枡浜猴級
- remarks: ''// 澶囨敞
+ remarks: '', // 澶囨敞
+ productionType: 'personal'// 鐢熶骇绫诲瀷
},
+ productionTypeSelect: [
+ { code: 'personal', name: '涓汉绫诲瀷' },
+ { code: 'team', name: '鐝粍绫诲瀷' }
+ ], // 鐢熶骇绫诲瀷鏁扮粍
ZZuserArr: [], // 鑷埗鐢ㄦ埛鎵�鏈�
ZZtreams: [], // 鑷埗鐢熶骇鐝粍鏁扮粍
ZZeqpArr: [], // 鑷埗璁惧鍚嶇О
@@ -1297,6 +1317,9 @@
],
startqty: [
{ required: true, message: '璇疯緭鍏ユ姤宸ユ暟閲�', trigger: ['blur', 'change'] }
+ ],
+ productionType: [
+ { required: true, message: '璇烽�夋嫨鐢熶骇绫诲瀷', trigger: ['blur', 'change'] }
]
},
activeName: '',
@@ -1397,6 +1420,13 @@
this.getMesOrderSelectUserAll() // 鑾峰彇鎵�鏈変汉鍛�
},
methods: {
+ // 閫夋嫨鐢熶骇绫诲瀷
+ usergroupChange111(val) {
+ console.log(val)
+ if (val === 'personal') {
+ this.dialogForm.usergroupcode = ''
+ }
+ },
tableRowClassName({ row, rowIndex }) {
return 'custom-row'
@@ -1822,6 +1852,10 @@
},
// 鐢ㄦ埛娣诲姞
userAdd() {
+ if (this.userTableData.find(i => i.isVisible === 1)) {
+ return this.$message.info('璇峰厛淇濆瓨褰撳墠琛屼俊鎭紒')
+ }
+
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
console.log(this.userTableData, 6)
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 21bd725..2acb554 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -150,6 +150,7 @@
prop="wksp_name"
label="鐢熶骇杞﹂棿"
min-width="110"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -163,12 +164,13 @@
prop="stepname"
label="鍔犲伐宸ュ簭"
sortable="custom"
- min-width="110"
+ min-width="90"
/>
<el-table-column
prop="eqp_name"
- label="鍔犲伐璁惧"
+ label="鍔犲伐璁惧/渚涙柟"
min-width="110"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -344,23 +346,25 @@
/>
<el-table-column
prop="eqpcode"
- label="璁惧缂栫爜"
+ :label="eqpTable.steptype==='Z'?'璁惧缂栫爜':'澶栧崗渚涙柟缂栫爜'"
sortable="custom"
min-width="110"
/>
<el-table-column
prop="eqpname"
- label="璁惧鍚嶇О"
+ :label="eqpTable.steptype==='Z'?'璁惧鍚嶇О':'澶栧崗渚涙柟鍚嶇О'"
min-width="110"
sortable="custom"
/>
<el-table-column
+ v-if="eqpTable.steptype==='Z'"
prop="wksp_name"
sortable="custom"
label="鐢熶骇杞﹂棿"
min-width="110"
/>
<el-table-column
+ v-if="eqpTable.steptype==='Z'"
sortable="custom"
prop="eqp_value"
label="璁惧鑺傛媿"
@@ -380,6 +384,7 @@
</template>
</el-table-column>
<el-table-column
+ v-if="eqpTable.steptype==='Z'"
prop="stand_value"
label="鐢熶骇鑺傛媿"
sortable="custom"
@@ -390,6 +395,7 @@
</template>
</el-table-column>
<el-table-column
+ v-if="eqpTable.steptype==='Z'"
prop="cavity_qty"
label="鑵斿瀷鏁�"
sortable="custom"
@@ -533,10 +539,11 @@
partcode: '',
routecode: '',
stepcode: '',
+ steptype: '',
page: 1,
rows: 10,
prop: 'eqpcode',
- order: 'desc'
+ order: 'asc'
},
eqpTableLength: 0,
isEqpTableEdit: true,
@@ -665,10 +672,15 @@
},
async getEqpTable(val) {
if (typeof val === 'string') {
+ console.log('鎵ц1')
+ this.eqpTable.steptype = this.stepDialogArr.find(item => item.name === val).flag
this.eqpTable.partcode = this.dialogForm.partcode
this.eqpTable.routecode = this.dialogForm.routecode
this.eqpTable.stepcode = this.stepDialogArr.find(item => item.name === val).code
} else if (typeof val === 'number') {
+ console.log('鎵ц2')
+ // console.log(this.stepDialogArr)
+ this.eqpTable.steptype = this.stepDialogArr[0].flag
this.eqpTable.partcode = this.dialogForm.partcode
this.eqpTable.routecode = this.dialogForm.routecode
this.eqpTable.stepcode = this.stepDialogArr[0].code
diff --git a/vue.config.js b/vue.config.js
index c41496a..3b6ce57 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -50,7 +50,7 @@
},
proxy: {
[process.env.VUE_APP_BASE_API]: {
- target: 'http://121.196.36.24:8003', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴鏈嶅姟鍣�(鐏电繑)
+ target: 'http://121.196.36.24:8005', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴鏈嶅姟鍣�(鐏电繑)
// target: 'http://192.168.2.138:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 瀹㈡埛鏈嶅姟鍣�(鐏电繑)
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
--
Gitblit v1.9.3