From 6caecd26f75979777956dc96e14d6f3b39ce6688 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 15 七月 2022 17:23:42 +0800
Subject: [PATCH] 1.修改bug
---
src/views/zzmx/gylx.vue | 18 ++++
src/views/sbgl/sbqd.vue | 59 +++++++-------
src/views/scgl/sckbg.vue | 109 +++++++++++++++++++++++++--
3 files changed, 149 insertions(+), 37 deletions(-)
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 819994c..5ed3550 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -167,11 +167,11 @@
label="鐢熶骇杞﹂棿"
sortable="custom"
/>
- <el-table-column
- prop="Line_name"
- label="鎵�灞炰骇绾�"
- sortable="custom"
- />
+ <!-- <el-table-column-->
+ <!-- prop="Line_name"-->
+ <!-- label="鎵�灞炰骇绾�"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
<el-table-column
prop="operation_ration"
label="绋煎姩鐜�"
@@ -297,23 +297,23 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鎵�灞炰骇绾�" prop="linecode">
- <el-select
- v-model="dialogForm.linecode"
- filterable
- :popper-append-to-body="false"
- :disabled="dialogForm.workshopcode===''"
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in WorkLineArr"
- :key="item.linecode"
- :label="item.linename"
- :value="item.linecode"
- />
- </el-select>
- </el-form-item>
+ <!-- <el-form-item label="鎵�灞炰骇绾�" prop="linecode">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.linecode"-->
+ <!-- filterable-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- :disabled="dialogForm.workshopcode===''"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in WorkLineArr"-->
+ <!-- :key="item.linecode"-->
+ <!-- :label="item.linename"-->
+ <!-- :value="item.linecode"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
<el-form-item label="浣跨敤鐘舵��" prop="status">
<el-select
v-model="dialogForm.status"
@@ -637,9 +637,9 @@
workshopcode: [
{ required: true, message: '璇烽�夋嫨鎵�灞炶溅闂�', trigger: ['blur', 'change'] }
],
- linecode: [
- { required: true, message: '璇烽�夋嫨鎵�灞炰骇绾�', trigger: ['blur', 'change'] }
- ],
+ // linecode: [
+ // { required: true, message: '璇烽�夋嫨鎵�灞炰骇绾�', trigger: ['blur', 'change'] }
+ // ],
status: [
{ required: true, message: '璇烽�夋嫨浣跨敤鐘舵��', trigger: ['blur', 'change'] }
]
@@ -752,7 +752,7 @@
this.dialogForm.devicegroupcode = row.eqpgroup_code
this.dialogForm.importdate = row.input_date
this.dialogForm.workshopcode = row.wksp_code
- this.dialogForm.linecode = row.Line_code
+ // this.dialogForm.linecode = row.Line_code
this.dialogForm.status = row.enable
this.dialogForm.ratio = row.operation_ration
})
@@ -783,7 +783,7 @@
this.dialogForm.devicegroupcode = ''
this.dialogForm.importdate = ''
this.dialogForm.workshopcode = ''
- this.dialogForm.linecode = ''
+ // this.dialogForm.linecode = ''
this.dialogForm.status = ''
this.dialogForm.ratio = ''
this.$refs.dialogForm.clearValidate()
@@ -792,7 +792,7 @@
async workshopcodeChange(val) {
const { data: res } = await WorkShopSelectLine({ workshopcode: val })
this.WorkLineArr = res
- this.dialogForm.linecode = ''
+ // this.dialogForm.linecode = ''
},
// 瀵硅瘽妗嗚澶囩被鍨嬩笅鎷夐�夋嫨鏀瑰彉鏃�
async devicetypecodeChange(val) {
@@ -816,7 +816,8 @@
devicegroupcode: this.dialogForm.devicegroupcode,
importdate: handleDatetime(this.dialogForm.importdate),
workshopcode: this.dialogForm.workshopcode,
- linecode: this.dialogForm.linecode,
+ // linecode: this.dialogForm.linecode,
+ linecode: '',
status: this.dialogForm.status,
ratio: this.dialogForm.ratio,
OperType: this.operation === 'add' ? 'Add' : 'Update'
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 8831aa6..252e3c9 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -2,11 +2,11 @@
<div>
<div class="body" style="padding: 0;height: 100%" :style="{height:mainHeight+'px'}">
- <el-tabs ref="elTabs" type="border-card" @tab-click="tabClick">
+ <el-tabs ref="elTabs" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="鐢熶骇鍒楄〃">
<div style="margin-left: 10px;margin-top:10px;display: flex;justify-content: space-between">
<div style="display: flex;align-items: center">
- <div style="width: 70px">鎵爜锛�</div>
+ <div style="width: 90px">鎵弿鏉＄爜锛�</div>
<el-input
v-model="form.orderstepqrcode"
oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"
@@ -163,7 +163,7 @@
:value="item.code"
/>
</el-select>
- <div style="width: 70px;margin-left: 20px">鎵爜锛�</div>
+ <div style="width: 90px;margin-left: 20px">鎵弿鏉＄爜锛�</div>
<el-input
v-model="WXform.orderstepqrcode"
oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"
@@ -303,7 +303,88 @@
@pagination="getMesOrderStepSearch"
/>
</el-tab-pane>
+ <el-tab-pane v-if="false" label="宸ュ簭妫�楠�">
+ <div style="margin-left: 10px;margin-top:10px;display: flex;flex-direction: column">
+ <div style="margin-bottom: 10px;font-size: 14px">
+ <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />鎵爜淇℃伅
+ </div>
+ <div style="display: flex;align-items: center">
+ <div style="width: 90px">鎵弿鏉＄爜锛�</div>
+ <el-input
+ v-model="GXform.orderstepqrcode"
+ oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"
+ name="GXproduceCode"
+ style="width: 300px"
+ @keyup.enter.native="val=>enterNative(val,'GXproduceCode')"
+ />
+ </div>
+ <div style="line-height: 40px; display: flex;margin-top: 20px">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">宸ュ崟缂栫爜锛�</div>
+ <div>PX00120012312</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">浜у搧缂栫爜锛�</div>
+ <div>123-446-789</div>
+ </div>
+ </div>
+ <div style="line-height: 40px; display: flex;">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">浜у搧鍚嶇О锛�</div>
+ <div>PX00120012312</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">浜у搧瑙勬牸锛�</div>
+ <div>123-446-789</div>
+ </div>
+ </div>
+ <div style="line-height: 40px; display: flex;">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">宸ュ簭缂栫爜锛�</div>
+ <div>PX00120012312</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">宸ュ簭鍚嶇О锛�</div>
+ <div>123-446-789</div>
+ </div>
+ </div>
+ <div style="margin: 20px 0;font-size: 14px">
+ <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠屾爣鍑嗕俊鎭�
+ </div>
+ <div style="display: flex;align-items: center">
+ <div style="width: 90px">妫�楠屾爣鍑嗭細</div>
+ <el-select
+ v-model="dialogForm.aaa"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in ARR"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ <div style="width: 90px;margin-left: 50px;">妫�楠屾爣鍑嗭細</div>
+ <el-select
+ v-model="dialogForm.aaa"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in ARR"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </div>
+ <div style="margin: 20px 0;font-size: 14px">
+ <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠岄」淇℃伅
+ </div>
+ </div>
+ </el-tab-pane>
</el-tabs>
</div>
@@ -649,8 +730,6 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
import $ from 'jquery'
import {
MesOrderGroupSelectUser,
@@ -668,7 +747,6 @@
SavaMesOrderStepReport
} from '@/api/scgl'
import { urlAddRandomNo, webapp_urlprotocol_startup, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
-import { MesOrderPrintSearch1 } from '@/api/utils'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -712,7 +790,6 @@
total: 10,
tableData: [],
WXform: { // 澶栧崗琛ㄥ崟
- // PO202206280001_4;Step01
orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
prop: 'wo_code', // 鎺掑簭瀛楁z
order: 'asc', // 鎺掑簭瀛楁
@@ -774,7 +851,6 @@
UserTotal: 0,
Userform: {},
userIsSave: false, // 姝や汉鍛樻槸鍚﹀彲淇濇寔
- // operation: '',
dialogFormRules: {
outuser: [
{ required: true, message: '璇烽�夋嫨鍙戞枡浜哄憳', trigger: ['blur', 'change'] }
@@ -806,6 +882,14 @@
startqty: [
{ required: true, message: '璇疯緭鍏ユ姤宸ユ暟閲�', trigger: ['blur', 'change'] }
]
+ },
+ activeName: '',
+ GXform: { // 宸ュ簭
+ orderstepqrcode: '' // 鎵弿鐨勪簩缁寸爜淇℃伅
+ // prop: 'wo_code', // 鎺掑簭瀛楁z
+ // order: 'asc', // 鎺掑簭瀛楁
+ // page: 1, // 绗嚑椤�
+ // rows: 20 // 姣忛〉澶氬皯鏉�
}
}
@@ -889,6 +973,11 @@
// this.form.orderstepqrcode = ''
})
}
+ if (this.$refs.elTabs.currentName === '2') {
+ this.$nextTick(() => {
+ $("input[name='GXproduceCode']")[0].focus()
+ })
+ }
},
// 鎵爜閿洏鍥炶溅浜嬩欢
async enterNative(val, belong) {
@@ -928,6 +1017,10 @@
await this.WXback(res.data)
}
}
+
+ if (belong === 'GXproduceCode') {
+ console.log('GXproduceCode')
+ }
},
// 鏌ヨ
search() {
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index aa4eff6..e31a9b6 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -392,6 +392,17 @@
return this.$message.info('杈撳叆妗嗗唴瀹逛笌涓嬫媺閫夐」鍐呭涓嶅尮閰嶏紒')
}
+ // 3.杈撳叆妗嗗唴瀹逛笌宸查�夊唴瀹圭浉鍚屾椂涓嶈兘淇濆瓨
+ let flag2 = false
+ this.dynamicTags.forEach(item => {
+ if (item.stepname === this.autocompleteValue.trim()) {
+ flag2 = true
+ }
+ })
+ if (flag2) {
+ return this.$message.info('姝ゅ伐搴忓凡閫夛紝璇烽�夋嫨鍏跺畠宸ュ簭锛�')
+ }
+
// 灏嗗�兼浛鎹㈠埌鍘焧ag浣嶇疆涓�
this.dynamicTags.forEach((item, index) => {
if ((index + 1) === tag.seq) {
@@ -608,6 +619,13 @@
this.dynamicTags.forEach(item => {
Data.push({ seq: item.seq, stepcode: item.stepcode, stepname: item.stepname })
})
+
+ Data.forEach(item => {
+ if (item.stepname === this.routeArr.find(it => it.stepname === item.stepname).stepname) {
+ item.stepcode = this.routeArr.find(it => it.stepname === item.stepname).stepcode
+ }
+ })
+ console.log(Data, 32)
this.$refs.dialogForm.validate(valid => {
if (valid) {
const data = {
--
Gitblit v1.9.3