From 1e9fa82cb2fe2c15f46bd1dd73f5c878c74b83b8 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 04 八月 2022 15:35:50 +0800
Subject: [PATCH] 1.系统多账号登录问题2.采购订单页面样式修改及数据渲染
---
src/views/scgl/sckbg.vue | 1402 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 1,052 insertions(+), 350 deletions(-)
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 378bd37..9810c13 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -1,21 +1,21 @@
<template>
<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>
+ <!-- oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"-->
+
<el-input
- v-model="produceCode"
- oninput="value=value.replace(/[^0-9.]/g,'')"
+ v-model="form.orderstepqrcode"
name="produceCode"
- style="width: 500px"
+ style="width: 300px"
@keyup.enter.native="val=>enterNative(val,'produceCode')"
/>
</div>
- <div style="display: flex;padding-right: 10px">
+ <div v-if="false" style="display: flex;padding-right: 10px">
<el-button @click="ZZstart">
<svg-icon icon-class="start_time" style="margin-right: 2px" />
寮�濮�
@@ -30,7 +30,7 @@
<div class="elTableDiv">
<el-table
:data="tableData"
- :height="tableHeight"
+ :height="tableHeight+'px'"
border
stripe
:style="{width: 100+'%',height:tableHeight+'px',}"
@@ -39,87 +39,105 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
- <!-- <el-table-column-->
- <!-- type="selection"-->
- <!-- width="50"-->
- <!-- />-->
- <el-table-column
- width="50"
- >
- <template slot-scope="{row}">
- <!-- <el-radio-->
- <!-- v-model="radioSelected"-->
- <!-- :label="row.wo"-->
- <!-- style="color: #fff;padding-left: 10px; margin-right: -25px;"-->
- <!-- @change.native="getCurrentRow(row.wo)"-->
- <!-- />-->
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- width="50"-->
+ <!-- fixed-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <el-radio-->
+ <!-- v-model="radioSelected"-->
+ <!-- :label="row.wo"-->
+ <!-- style="color: #fff;padding-left: 10px; margin-right: -25px;"-->
+ <!-- @change.native="getCurrentRow(row.wo)"-->
+ <!-- />-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
- prop="org_code"
+ prop="status"
label="鐘舵��"
sortable="custom"
- />
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.status==='NEW'">鏂拌鍗�</div>
+ <div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
+ <div v-if="row.status==='START'">寮�宸�</div>
+ <div v-if="row.status==='CLOSED'">瀹屽伐</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="org_name"
+ prop="wo_code"
label="宸ュ崟鍙�"
+ min-width="160"
sortable="custom"
/>
<el-table-column
- prop="description"
+ prop="partcode"
label="浜у搧缂栫爜"
+ min-width="110"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="partname"
+ min-width="110"
label="浜у搧鍚嶇О"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="stepname"
label="宸ュ簭"
+ min-width="80"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="descr"
label="宸ュ簭鎻忚堪"
+ min-width="150"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="plan_qty"
label="浠诲姟鏁伴噺"
+ width="110"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
- label="宸叉姤宸ユ暟閲�"
+ prop="good_qty"
+ label="宸叉姤宸ユ暟閲�(鑹搧)"
sortable="custom"
+ width="160"
/>
<el-table-column
- prop="lm_user"
+ prop="ng_qty"
label="涓嶈壇鏁伴噺"
+ width="150"
+
sortable="custom"
/>
<el-table-column
- prop="lm_date"
+ prop="plan_startdate"
label="璁″垝寮�宸ユ棩鏈�"
+ width="185"
sortable="custom"
/>
- <el-table-column
- label="鎿嶄綔"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
- </div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- label="鎿嶄綔"-->
+ <!-- width="150"-->
+ <!-- fixed="right"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div class="operationClass">-->
+ <!-- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
+ <!-- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>-->
+ <!-- </div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
</el-table>
</div>
<!--鍒嗛〉-->
@@ -137,16 +155,29 @@
<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-select
+ v-model="WXSelected"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in WXSelectArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ <div style="width: 90px;margin-left: 20px">鎵弿鏉＄爜锛�</div>
<el-input
- v-model="WXproduceCode"
- oninput="value=value.replace(/[^0-9.]/g,'')"
+ v-model="WXform.orderstepqrcode"
name="WXproduceCode"
- style="width: 500px"
+ style="width: 300px"
@keyup.enter.native="val=>enterNative(val,'WXproduceCode')"
/>
</div>
- <div style="display: flex;padding-right: 10px">
+ <div v-if="false" style="display: flex;padding-right: 10px">
<el-button @click="WXsend">
<svg-icon icon-class="start_time" style="margin-right: 2px" />
鍙戞枡
@@ -161,96 +192,113 @@
<div class="elTableDiv">
<el-table
:data="WXtableData"
- :height="tableHeight"
+ :height="tableHeight+'px'"
border
stripe
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
- @sort-change="sortChange"
+ @sort-change="WXsortChange"
>
- <!-- <el-table-column-->
- <!-- type="selection"-->
- <!-- width="50"-->
- <!-- />-->
- <el-table-column
- width="50"
- >
- <template slot-scope="{row}">
- <!-- <el-radio-->
- <!-- v-model="radioSelected"-->
- <!-- :label="row.wo"-->
- <!-- style="color: #fff;padding-left: 10px; margin-right: -25px;"-->
- <!-- @change.native="getCurrentRow(row.wo)"-->
- <!-- />-->
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- width="50"-->
+ <!-- fixed-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <el-radio-->
+ <!-- v-model="radioSelected"-->
+ <!-- :label="row.wo_code"-->
+ <!-- style="color: #fff;padding-left: 10px; margin-right: -25px;"-->
+ <!-- @change.native="getWXCurrentRow(row.wo_code)"-->
+ <!-- />-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
- prop="org_code"
+ prop="status"
label="鐘舵��"
sortable="custom"
- />
- <el-table-column
- prop="org_name"
- label="宸ュ崟鍙�"
- sortable="custom"
- />
- <el-table-column
- prop="description"
- label="浜у搧缂栫爜"
- sortable="custom"
- />
- <el-table-column
- prop="parentorg_name"
- label="浜у搧鍚嶇О"
- sortable="custom"
- />
- <el-table-column
- prop="parentorg_name"
- label="宸ュ簭"
- sortable="custom"
- />
- <el-table-column
- prop="parentorg_name"
- label="宸ュ簭鎻忚堪"
- sortable="custom"
- />
- <el-table-column
- prop="parentorg_name"
- label="浠诲姟鏁伴噺"
- sortable="custom"
- />
- <el-table-column
- prop="parentorg_name"
- label="宸叉姤宸ユ暟閲�"
- sortable="custom"
- />
- <el-table-column
- prop="lm_user"
- label="涓嶈壇鏁伴噺"
- sortable="custom"
- />
- <el-table-column
- prop="lm_date"
- label="璁″垝寮�宸ユ棩鏈�"
- sortable="custom"
- />
- <el-table-column
- label="鎿嶄綔"
+ width="110"
>
<template slot-scope="{row}">
- <div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
- </div>
+ <div v-if="row.status==='NEW'">鏂拌鍗�</div>
+ <div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
+ <div v-if="row.status==='START'">宸插彂鏂�</div>
+ <div v-if="row.status==='CLOSED'">宸叉敹鏂�</div>
</template>
</el-table-column>
+ <el-table-column
+ prop="wo_code"
+ label="宸ュ崟鍙�"
+ min-width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partcode"
+ label="浜у搧缂栫爜"
+ min-width="110"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ min-width="110"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="stepname"
+ label="宸ュ簭"
+ min-width="80"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="descr"
+ label="宸ュ簭鎻忚堪"
+ min-width="150"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="plan_qty"
+ label="浠诲姟鏁伴噺"
+ width="110"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="good_qty"
+ label="宸叉敹鏂欐暟閲�(鑹搧)"
+ sortable="custom"
+ width="160"
+ />
+ <el-table-column
+ prop="ng_qty"
+ label="涓嶈壇鏁伴噺"
+ width="150"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="plan_startdate"
+ label="璁″垝寮�宸ユ棩鏈�"
+ width="185"
+ sortable="custom"
+ />
+ <!-- <el-table-column-->
+ <!-- label="鎿嶄綔"-->
+ <!-- width="150"-->
+ <!-- fixed="right"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div class="operationClass">-->
+ <!-- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
+ <!-- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>-->
+ <!-- </div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
</el-table>
</div>
<!--鍒嗛〉-->
@@ -265,7 +313,6 @@
@pagination="getMesOrderStepSearch"
/>
</el-tab-pane>
-
</el-tabs>
</div>
@@ -280,101 +327,123 @@
@close="handleClose"
@closed="handleClose"
>
- <el-form ref="dialogForm" inline :model="dialogForm" label-width="110px">
+ <el-form
+ ref="dialogForm"
+ inline
+ :rules="dialogFormRules"
+ :model="dialogForm"
+ label-width="110px"
+ >
<el-form-item label="宸ュ崟缂栧彿锛�">
- <!-- <el-input v-model="dialogForm.name"></el-input>-->
- <div style="width: 200px">PO2022050500001</div>
+ <div style="width: 200px">{{ dialogForm.wo_code }}</div>
</el-form-item>
<el-form-item label="浜у搧缂栫爜锛�">
- <div style="width: 200px">427100</div>
+ <div style="width: 200px">{{ dialogForm.partcode }}</div>
</el-form-item>
<el-form-item label="浜у搧鍚嶇О锛�">
- <div style="width: 200px">鏈虹鏉垮簳</div>
+ <div style="width: 200px">{{ dialogForm.partname }}</div>
</el-form-item>
<el-form-item label="浜у搧瑙勬牸锛�">
- <div style="width: 200px">鏈虹搴曟澘&1</div>
+ <div style="width: 200px">{{ dialogForm.partspec }}</div>
</el-form-item>
<el-form-item label="褰撳墠宸ュ簭锛�">
- <div style="width: 200px">婵�鍏夊垏鍓�</div>
+ <div style="width: 200px">{{ dialogForm.stepname }}</div>
</el-form-item>
<el-form-item label="宸ュ簭鎻忚堪锛�">
- <el-tooltip class="item" effect="dark" content="鍘熸潗鏂欏垏鎸夋潗鏂欏垏鎸夋潗鏂欏垏鎸夋椂鎵撳崱鏁版嵁鐨勫崱" placement="top-start">
- <div style="width: 200px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;">
- 鍘熸潗鏂欏垏鎸夋潗鏂欏垏鎸夋潗鏂欏垏鎸夋椂鎵撳崱鏁版嵁鐨勫崱
- </div>
- </el-tooltip>
+ <!-- <el-tooltip class="item" effect="dark" content="鍘熸潗鏂欏垏鎸夋潗鏂欏垏鎸夋潗鏂欏垏鎸夋椂鎵撳崱鏁版嵁鐨勫崱" placement="top-start">-->
+ <div style="width: 200px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;">
+ {{ dialogForm.stepdesc }}
+ </div>
+ <!-- </el-tooltip>-->
</el-form-item>
<el-form-item label="浠诲姟鏁伴噺锛�">
- <div style="width: 200px">1000</div>
+ <div style="width: 200px">{{ dialogForm.planqty }}</div>
</el-form-item>
- <el-form-item label="鏈姤/宸叉姤锛�">
- <div style="width: 200px">900/100</div>
+
+ <el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="鏈紑/宸插紑锛�">
+ <div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
</el-form-item>
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鏈姤/宸叉姤锛�">
+ <div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
+ </el-form-item>
+ <el-form-item v-if="dialogTitle==='澶栧崗鍙戞枡'" label="鏈彂/宸插彂锛�">
+ <div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
+ </el-form-item>
+ <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="鏈敹/宸叉敹锛�">
+ <div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
+ </el-form-item>
+ <!--鑷埗寮�濮�-->
<el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="寮�宸ユ暟閲忥細">
- <div style="width: 200px">1000</div>
+ <div style="width: 200px">{{ dialogForm.startqty }}</div>
+ <!-- <div style="width: 200px">{{ dialogForm.noreportqty }}</div>-->
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="鐢熶骇璁惧锛�">
+ <el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" prop="eqpcode" label="鐢熶骇璁惧锛�">
<el-select
- v-model="dialogForm.OrgType"
+ v-model="dialogForm.eqpcode"
style="width: 200px;"
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ v-for="item in ZZeqpArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
+ <!-- 鑷埗鎶ュ伐 -->
<el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嬮亾宸ュ簭锛�">
- <div style="width: 200px">B宸ュ簭</div>
+ <div style="width: 200px">{{ dialogForm.nextstepname }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="璁惧鍚嶇О锛�">
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" prop="usergroupcode" label="鐢熶骇鐝粍锛�">
<el-select
- v-model="dialogForm.OrgType"
+ v-model="dialogForm.usergroupcode"
style="width: 200px;"
placeholder="璇烽�夋嫨"
+ @change="usergroupChange"
>
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鐢熶骇鐝粍锛�">
- <el-select
- v-model="dialogForm.OrgType"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in options"
+ v-for="item in ZZtreams"
:key="item.group_code"
:label="item.group_name"
:value="item.group_code"
/>
</el-select>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鎶ュ伐鏁伴噺锛�">
- <el-input v-model="dialogForm.OrgName" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
- </el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鏁伴噺锛�">
- <el-input v-model="dialogForm.OrgName" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
- </el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鍘熷洜锛�">
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="璁惧鍚嶇О锛�" prop="eqpcode">
<el-select
- v-model="dialogForm.OrgType"
+ v-model="dialogForm.eqpcode"
style="width: 200px;"
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ v-for="item in ZZeqpArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鎶ュ伐鏁伴噺锛�" prop="startqty">
+ <el-input v-model="dialogForm.startqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
+ <!-- <el-input v-model="dialogForm.noreportqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />-->
+ </el-form-item>
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鏁伴噺锛�">
+ <el-input v-model="dialogForm.noputqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
+ </el-form-item>
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鍘熷洜锛�">
+ <el-select
+ v-model="dialogForm.badcode"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ :disabled="parseFloat(dialogForm.noputqty)===0||dialogForm.noputqty.trim()===''"
+ multiple
+ >
+ <el-option
+ v-for="item in badArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
@@ -392,29 +461,30 @@
style="width: 100%"
>
<el-table-column
- prop="RowNum"
+ width="100"
label="搴忓彿"
+ type="index"
/>
<el-table-column
- prop="name"
+ prop="username"
label="浜哄憳鍚嶇О"
>
<template slot-scope="{row}">
- <div v-if="row.isVisible===0">{{ row.name }}</div>
- <el-input v-if="row.isVisible===1" v-model="row.name" />
- <!-- <el-select-->
- <!-- v-if="row.isVisible===1"-->
- <!-- v-model="dialogForm.OrgType"-->
- <!-- style="width: 200px;"-->
- <!-- placeholder="璇烽�夋嫨"-->
- <!-- >-->
- <!-- <el-option-->
- <!-- v-for="item in options"-->
- <!-- :key="item.value"-->
- <!-- :label="item.label"-->
- <!-- :value="item.value"-->
- <!-- />-->
- <!-- </el-select>-->
+ <div v-if="row.isVisible===0">{{ row.username }}</div>
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.username"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ @change="val=>usernameChange(val,row)"
+ >
+ <el-option
+ v-for="item in ZZuserArr"
+ :key="item.usercode"
+ :label="item.username"
+ :value="item.usercode"
+ />
+ </el-select>
</template>
</el-table-column>
<el-table-column
@@ -424,7 +494,7 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-button v-if="row.isVisible===0" type="text" @click="userDel(row)">鍒犻櫎</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="userSave(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1&&!userIsSave" type="text" @click="userSave(row)">淇濆瓨</el-button>
<el-button v-if="row.isVisible===1" type="text" @click="userCancel(row)">鍙栨秷</el-button>
</div>
</template>
@@ -442,88 +512,134 @@
@pagination="getMesOrderStepSearch"
/>
</div>
- <el-form-item v-if="dialogTitle==='澶栧崗鍙戞枡'" label="澶栧崗渚涙柟锛�">
+ <!-- 澶栧崗鍙戞枡-->
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鍙戞枡'"
+ label="澶栧崗渚涙柟锛�"
+ prop="wxcode"
+ >
<el-select
- v-model="dialogForm.OrgType"
+ v-model="dialogForm.wxcode"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ filterable
+ >
+ <el-option
+ v-for="item in WXouterprovide"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鍙戞枡'"
+ label="鍙戞枡浜哄憳锛�"
+ prop="outuser"
+ >
+ <el-select
+ v-model="dialogForm.outuser"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ filterable
+ >
+ <el-option
+ v-for="item in WXoutuser"
+ :key="item.usercode"
+ :label="item.username"
+ :value="item.usercode"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鍙戞枡'"
+ label="鍙戞枡鏁伴噺锛�"
+ prop="fqty"
+ >
+ <el-input v-model="dialogForm.fqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
+ </el-form-item>
+ <!-- 澶栧崗鏀舵枡-->
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鏀舵枡'"
+ label="涓嬮亾宸ュ簭锛�"
+ >
+ <div style="width: 200px">{{ dialogForm.nextstepname }}</div>
+ </el-form-item>
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鏀舵枡'"
+ label="澶栧崗渚涙柟锛�"
+ prop="wxcode"
+ >
+ <el-select
+ v-model="dialogForm.wxcode"
style="width: 200px;"
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ v-for="item in WXouterprovide"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鍙戞枡'" label="鍙戞枡浜哄憳锛�">
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鏀舵枡'"
+ label="鏀舵枡浜哄憳锛�"
+ prop="inuser"
+ >
<el-select
- v-model="dialogForm.OrgType"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- multiple
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鍙戞枡'" label="鍙戞枡鏁伴噺锛�">
- <el-input v-model="dialogForm.OrgName" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
- </el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="涓嬮亾宸ュ簭锛�">
- <div style="width: 200px">B宸ュ簭</div>
- </el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="澶栧崗渚涙柟锛�">
- <el-select
- v-model="dialogForm.OrgType"
+ v-model="dialogForm.inuser"
style="width: 200px;"
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ v-for="item in WXoutuser"
+ :key="item.usercode"
+ :label="item.username"
+ :value="item.usercode"
/>
</el-select>
</el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="鏀舵枡浜哄憳锛�">
- <el-select
- v-model="dialogForm.OrgType"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- multiple
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="鏀舵枡鏁伴噺锛�">
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鏀舵枡'"
+ label="鏀舵枡鏁伴噺锛�"
+ prop="sqty"
+ >
<el-input
- v-model="dialogForm.OrgName"
+ v-model="dialogForm.sqty"
style="width: 200px"
oninput="value=value.replace(/[^0-9.]/g,'')"
/>
</el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="涓嶈壇鍘熷洜锛�">
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鏀舵枡'"
+ label="涓嶈壇鏁伴噺锛�"
+ prop="noputqty"
+ >
+ <el-input
+ v-model="dialogForm.noputqty"
+ style="width: 200px"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ />
+ </el-form-item>
+ <el-form-item
+ v-if="dialogTitle==='澶栧崗鏀舵枡'"
+ label="涓嶈壇鍘熷洜锛�"
+ prop="badcode"
+ >
<el-select
- v-model="dialogForm.OrgType"
+ v-model="dialogForm.badcode"
style="width: 200px;"
+ multiple
+ :disabled="parseFloat(dialogForm.noputqty)===0||dialogForm.noputqty.trim()===''"
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ v-for="item in badArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
@@ -539,19 +655,95 @@
</div>
</span>
</el-dialog>
+
+ <!--鎵撳嵃棰勮椤甸潰-->
+ <el-dialog
+ title="棰勮"
+ :visible.sync="dialogVisible2"
+ width="1140"
+ @close="dialogVisible2Close"
+ >
+ <!-- 瑕佹墦鍗扮殑鍖哄煙 -->
+ <div id="printMe2" style="padding: 30px;">
+ <div
+ style="display: flex;width: 250px;height: 150px;border: 1px solid #000;text-align: center;font-size: 10px;"
+ >
+
+ <div style="width: 60px;display: flex;flex-direction: column;border-right: 1px solid #000">
+ <div
+ style="display: flex;height: 75%;border-bottom:1px solid #000;justify-content: center;align-items: center "
+ >
+ <div id="qrCode2" ref="qrCodeDiv2" />
+ </div>
+ <div style="display: flex;height: 25%;justify-content: flex-start;align-items: center">
+ <div style="margin-left: 5px;width: 40px">鏁伴噺:</div>
+ {{ qrForm.startqty }}
+ </div>
+ </div>
+
+ <div style="width:190px;display: flex;flex-direction: column">
+ <div
+ style="display: flex;height: 25%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="width: 60px;margin-left: 5px;">宸ュ崟缂栧彿:</div>
+ <div>{{ qrForm.wo_code }}</div>
+ </div>
+ <div
+ style="display: flex;height: 25%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center ;text-align: left"
+ >
+ <div style="width: 60px;margin-left: 5px;">浜у搧缂栫爜:</div>
+ <div>{{ qrForm.partcode }}</div>
+ </div>
+ <div
+ style="display: flex;height: 25%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="width:60px;margin-left: 5px;">浜у搧鍚嶇О:</div>
+ <div>{{ qrForm.partname }}</div>
+ </div>
+ <div style="display: flex;height: 25%;justify-content: flex-start;align-items: center;text-align: left">
+ <div style="width: 60px;margin-left: 5px;">涓嬮亾宸ュ簭:</div>
+ <div>{{ qrForm.nextstepname }}</div>
+ </div>
+
+ </div>
+
+ </div>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button @click="dialogVisible2 = false">鍙� 娑�</el-button>
+ <el-button v-print="printObj2" type="primary">纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
</div>
</template>
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
import $ from 'jquery'
-import { MesOrderStepReportSelectUserGroup, MesOrderStepSearch, MesOrderStepStartSelectEqp } from '@/api/scgl'
+import {
+ MesOrderGroupSelectUser,
+ MesOrderSelectUser,
+ MesOrderStepReportSelectUserGroup,
+ MesOrderStepSearch,
+ MesOrderStepStart,
+ MesOrderStepStartSelectEqp,
+ MesOrderWxStepSearch,
+ MesOrderStepSelectWX,
+ SavaMesOrderStepOut,
+ MesOrderStepSelectCause,
+ SavaMesOrderStepIn,
+ SavaMesOrderStepStart,
+ SavaMesOrderStepReport
+} from '@/api/scgl'
+import { urlAddRandomNo, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
+import QRCode from 'qrcodejs2'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'SCKBG',
components: {
Pagination
},
@@ -577,12 +769,14 @@
return {
mainHeight: 0,
tableHeight: 0,
- produceCode: '', // 宸ュ簭鐮�
- WXproduceCode: '', // 澶栧崗宸ュ簭鐮�
+ // produceCode: '', // 宸ュ簭鐮�
+ // WXproduceCode: '', // 澶栧崗宸ュ簭鐮�
+ radioSelected: '', // 宸ュ簭閫変腑
+ WXradioSelected: '', // 宸ュ簭閫変腑
form: {
orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
- prop: 'lm_date', // 鎺掑簭瀛楁
- order: 'desc', // 鎺掑簭瀛楁
+ prop: 'wo_code', // 鎺掑簭瀛楁
+ order: 'asc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
@@ -590,50 +784,148 @@
tableData: [],
WXform: { // 澶栧崗琛ㄥ崟
orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
- prop: 'lm_date', // 鎺掑簭瀛楁
- order: 'desc', // 鎺掑簭瀛楁
+ prop: 'wo_code', // 鎺掑簭瀛楁z
+ order: 'asc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
WXtotal: 10, // 澶栧崗琛ㄥ崟鎬绘暟
WXtableData: [], // 澶栧崗琛�
+ WXSelectArr: [// 澶栧崗绫诲瀷涓嬫媺鍒楄〃
+ { code: 'OUT', name: '鍙戞枡' },
+ { code: 'IN', name: '鏀舵枡' }
+ ],
+ WXSelected: 'OUT', // 澶栧崗涓嬫媺鍒楄〃閫変腑鍊�
dialogVisible: false,
dialogTitle: '', // 鑷埗寮�濮嬨�佽嚜鍒舵姤宸ャ�佸鍗忓彂鏂欍�佸鍗忔敹鏂�
dialogForm: {
- OrgType: '',
- OrgCode: '',
- OrgName: '',
- SupUnit: ''// 涓婄骇鍗曚綅
+ wo_code: '', // 宸ュ崟缂栧彿
+ partcode: '', // 浜у搧缂栫爜
+ partname: '', // 浜у搧鍚嶇О
+ partspec: '', // 浜у搧瑙勬牸
+ stepseq: '', // 宸ュ簭搴忓彿
+ stepcode: '', // 宸ュ簭缂栫爜
+ stepname: '', // 褰撳墠宸ュ簭鍚�
+ nextstepname: '', // 涓嬩竴閬撳伐搴忓悕
+ stepdesc: '', // 宸ュ簭鎻忚堪
+ planqty: '', // 浠诲姟鏁伴噺
+ reportqty: '', // 宸叉姤鏁伴噺
+ noreportqty: '', // 鏈姤鏁伴噺
+ startqty: '', // 寮�(鎶�)宸ユ暟閲�
+
+ wxcode: '', // 澶栧崗渚涘簲鍟嗙紪鐮�
+ outuser: '', // 鍙戞枡浜哄憳
+ taskqty: '', // 浠诲姟鏁伴噺
+ fqty: '', // 鍙戞枡鏁伴噺
+
+ inuser: '', // 鏀舵枡浜哄憳
+ sqty: '', // 鏀舵枡鏁伴噺
+ ngqty: '', // 涓嶈壇鏁伴噺
+ badcode: '', // 涓嶈壇鍘熷洜缂栫爜
+
+ noputqty: '', // 涓嶈壇鏁伴噺
+
+ eqpcode: '', // 鐢熶骇璁惧缂栫爜
+
+ usergroupcode: '', // 鐝粍缂栫爜
+ reportuser: '', // 鎶ュ伐浜哄憳
+
+ startqtySum: '' // 涓嶈兘瓒呰繃鐨勬暟鍊�
+
},
- userTableData: [
- { RowNum: 1, name: '寮犱笁' },
- { RowNum: 2, name: '鏉庡洓' }
- ], // 浜哄憳鍒楄〃
+ ZZuserArr: [], // 鑷埗鐢ㄦ埛鎵�鏈�
+ ZZtreams: [], // 鑷埗鐢熶骇鐝粍鏁扮粍
+ ZZeqpArr: [], // 鑷埗璁惧鍚嶇О
+ badArr: [], // 涓嶈壇鍘熷洜鏁扮粍
+ WXouterprovide: [], // 澶栧崗渚涙柟鏁扮粍
+ WXoutuser: [], // 鍙戞枡浜哄憳鏁扮粍
+ userTableData: [], // 浜哄憳鍒楄〃
UserTotal: 0,
- Userform: {
-
+ Userform: {},
+ userIsSave: false, // 姝や汉鍛樻槸鍚﹀彲淇濇寔
+ dialogFormRules: {
+ outuser: [
+ { required: true, message: '璇烽�夋嫨鍙戞枡浜哄憳', trigger: ['blur', 'change'] }
+ ],
+ fqty: [
+ { required: true, message: '璇疯緭鍏ュ彂鏂欐暟閲�', trigger: ['blur', 'change'] }
+ ],
+ wxcode: [
+ { required: true, message: '璇烽�夋嫨澶栧崗渚涙柟', trigger: ['blur', 'change'] }
+ ],
+ inuser: [
+ { required: true, message: '璇烽�夋嫨鏀舵枡浜哄憳', trigger: ['blur', 'change'] }
+ ],
+ sqty: [
+ { required: true, message: '璇疯緭鍏ユ敹鏂欐暟閲�', trigger: ['blur', 'change'] }
+ ],
+ // noputqty: [
+ // { required: true, message: '璇疯緭鍏ヤ笉鑹暟閲�', trigger: ['blur', 'change'] }
+ // ],
+ // badcode: [
+ // { required: true, message: '璇烽�夋嫨涓嶈壇鍘熷洜', trigger: ['blur', 'change'] }
+ // ]
+ eqpcode: [
+ { required: true, message: '璇烽�夋嫨鐢熶骇璁惧', trigger: ['blur', 'change'] }
+ ],
+ usergroupcode: [
+ { required: true, message: '璇烽�夋嫨鐢熶骇鐝粍', trigger: ['blur', 'change'] }
+ ],
+ startqty: [
+ { required: true, message: '璇疯緭鍏ユ姤宸ユ暟閲�', trigger: ['blur', 'change'] }
+ ]
+ },
+ activeName: '',
+ dialogVisible2: false,
+ printObj2: {
+ id: 'printMe2',
+ popTitle: '鎵撳嵃妯℃澘',
+ preview: false,
+ extraHead: '<meta http-equiv="Content-Language" content="zh-cn"/>',
+ closeCallback(vue) { // 鍏抽棴鎵撳嵃鐨勫洖璋冧簨浠讹紙鏃犳硶纭畾鐐瑰嚮鐨勬槸纭杩樻槸鍙栨秷锛�
+ console.log('11212', vue)
+ // vue.dialogVisible = false
+ vue.dialogVisible2 = false
+ vue.dialogVisible = false
+ },
+ beforeOpenCallback(vue) {
+ vue.printLoading = true
+ console.log('鎵撳紑涔嬪墠')
+ console.log()
+ },
+ openCallback(vue) {
+ vue.printLoading = false
+ console.log('鎵ц浜嗘墦鍗�')
+ }
+ },
+ qrForm: {
+ qrvalue: '',
+ startqty: '',
+ wo_code: '',
+ partcode: '',
+ partname: '',
+ nextstepname: ''
}
- // operation: '',
- // dialogFormRules: {
- // OrgType: [
- // { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
- // ],
- // OrgCode: [
- // { required: true, validator: validateName, trigger: ['blur', 'change'] }
- // ],
- // OrgName: [
- // { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
- // ],
- // SupUnit: [
- // { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
- // ]
- // }
-
}
},
+ // computed: {
+ // qrLink: function() {
+ // return this.$store.getters.getPreviewUrl
+ // }
+ // },
+ // watch: {
+ // qrLink: function(newVal, oldNew) {
+ // if (newVal !== oldNew) {
+ // this.$nextTick(() => {
+ // this.bindQRCode(newVal)
+ // })
+ // }
+ // }
+ // },
created() {
this.getMesOrderStepSearch()
+ this.tabClick()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -641,13 +933,24 @@
this.$nextTick(() => {
$("input[name='produceCode']")[0].focus()
+ // this.bindQRCode('10001;001')
})
+ // webapp_urlprotocol_startup()
+ // webapp_ws_autoupdate(true)
},
methods: {
async getMesOrderStepSearch() {
- // const res = await MesOrderStepSearch(this.form)
- // this.tableData = res.data
- // this.total = res.count
+ const res = await MesOrderStepSearch(this.form)
+ if (res.code === '200') {
+ this.tableData = res.data
+ this.total = res.count
+ }
+ },
+ async getMesOrderWxStepSearch() {
+ const res = await MesOrderWxStepSearch(this.WXform)
+ if (res.code === '200') {
+ this.WXtableData = res.data
+ }
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -662,35 +965,82 @@
this.form.prop = prop
this.getMesOrderStepSearch()
},
- getCurrentRow() {
+ // WX鎺掑簭鏀瑰彉鏃�
+ WXsortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.WXform.order = order
+ this.WXform.prop = prop
+ this.getMesOrderWxStepSearch()
+ },
+ // 鑷埗椤电鍘熺偣鐐瑰嚮
+ getCurrentRow(val) {
+ },
+ // 澶栧崗椤电鍘熺偣鐐瑰嚮
+ getWXCurrentRow(val) {
+ console.log(val)
+ this.WXradioSelected = val
},
// tab鎸夐挳鍒囨崲榧犳爣鑷姩鑱氱劍
tabClick(val, d) {
- console.log(val, d, 1)
if (this.$refs.elTabs.currentName === '0') {
this.$nextTick(() => {
+ this.getMesOrderStepSearch()
$("input[name='produceCode']")[0].focus()
+ this.WXform.orderstepqrcode = ''
})
}
if (this.$refs.elTabs.currentName === '1') {
this.$nextTick(() => {
+ this.getMesOrderWxStepSearch()
$("input[name='WXproduceCode']")[0].focus()
+ this.form.orderstepqrcode = ''
})
}
},
- async enterNative(val, belong) {
+ // 鎵爜閿洏鍥炶溅浜嬩欢
+ async enterNative(val, belong) {
console.log(val, belong)
+ // 寮�宸ワ細code="200" count=0
+ // 鎶ュ伐锛歝ode="200" count=1
+ // 鍙戞枡锛歝ode="200" count=2
+ // 鏀舵枡锛歝ode="200" count=3
+ // 璧板垪琛ㄥ舰寮� code="200" count=4
if (belong === 'produceCode') {
- this.ZZreport()
- // 鏌ユ壘璁惧
- // const {data:res} = await MesOrderStepStartSelectEqp({ orderstepqrcode: this.produceCode })
- // this.xxx=res
- // 鏌ユ壘鐝粍
- // const { data: res2 } = await MesOrderStepReportSelectUserGroup()
+ const orderstepqrcode = this.form.orderstepqrcode
+ const data = {
+ OperType: 'ZZ',
+ orderstepqrcode: orderstepqrcode,
+ SelectType: ''
+ }
+ const res = await MesOrderStepStart(data)
+ if (res.code === '200' && res.count === 0) {
+ await this.ZZstart(res.data)
+ }
+ if (res.code === '200' && res.count === 1) {
+ await this.ZZreport(res.data)
+ }
}
if (belong === 'WXproduceCode') {
-
+ const orderstepqrcode = this.WXform.orderstepqrcode
+ const data = {
+ OperType: 'WX',
+ orderstepqrcode: orderstepqrcode,
+ SelectType: this.WXSelected// OUT銆両N
+ }
+ const res = await MesOrderStepStart(data)
+ if (res.code === '200' && res.count === 2) {
+ await this.WXsend(res.data)
+ }
+ if (res.code === '200' && res.count === 3) {
+ await this.WXback(res.data)
+ }
}
},
// 鏌ヨ
@@ -698,29 +1048,183 @@
this.getMesOrderStepSearch()
},
// 鑷埗寮�濮�
- ZZstart() {
+ async ZZstart(obj) {
+ // if (!this.ZZisExecutable) {
+ // return this.$message.info('璇峰厛鎵爜宸ュ簭浜岀淮鐮侊紒')
+ // }
this.dialogTitle = '鑷埗寮�濮�'
this.dialogVisible = true
+
+ this.$nextTick(() => {
+ this.dialogForm.wo_code = obj.wo_code
+ this.dialogForm.partcode = obj.partnumber
+ this.dialogForm.partname = obj.partname
+ this.dialogForm.partspec = obj.partspec
+ this.dialogForm.stepseq = obj.seq
+ this.dialogForm.stepcode = obj.stepcode
+ this.dialogForm.stepname = obj.stepname
+ this.dialogForm.stepdesc = obj.stepdesc
+ this.dialogForm.planqty = obj.planqty
+ this.dialogForm.reportqty = obj.reportqty
+ this.dialogForm.noreportqty = obj.noreportqty
+ // this.dialogForm.startqty = obj.startqty
+ this.dialogForm.startqty = obj.noreportqty
+ })
+
+ await this.getMesOrderStepStartSelectEqp()
},
// 鑷埗鎶ュ伐
- ZZreport() {
+ async ZZreport(obj) {
+ // if (!this.ZZisExecutable) {
+ // return this.$message.info('璇峰厛鎵爜宸ュ簭浜岀淮鐮侊紒')
+ // }
this.dialogTitle = '鑷埗鎶ュ伐'
this.dialogVisible = true
- this.getUserTableData()
+
+ this.$nextTick(() => {
+ this.dialogForm.wo_code = obj.wo_code
+ this.dialogForm.partcode = obj.partnumber
+ this.dialogForm.partname = obj.partname
+ this.dialogForm.partspec = obj.partspec
+ this.dialogForm.stepseq = obj.seq
+ this.dialogForm.stepcode = obj.stepcode
+ this.dialogForm.stepname = obj.stepname
+ this.dialogForm.stepdesc = obj.stepdesc
+ this.dialogForm.planqty = obj.planqty
+ this.dialogForm.reportqty = obj.reportqty
+ this.dialogForm.noputqty = obj.noputqty
+ this.dialogForm.noreportqty = obj.noreportqty
+ // this.dialogForm.startqty = obj.startqty
+ this.dialogForm.startqty = obj.noreportqty
+
+ if (obj.nextstepname === null || obj.nextstepcode === '') {
+ this.dialogForm.nextstepname = obj.stepname
+ this.dialogForm.nextstepcode = obj.stepcode
+ } else {
+ this.dialogForm.nextstepname = obj.nextstepname
+ this.dialogForm.nextstepcode = obj.nextstepcode
+ }
+
+ this.dialogForm.startqtySum = obj.noreportqty
+ })
+
+ await this.getMesOrderStepStartSelectEqp()
+ await this.getMesOrderStepReportSelectUserGroup()
+ await this.getMesOrderStepSelectCause('ZZ')
+ await this.getMesOrderSelectUserZZ()
},
// 澶栧崗鍙戞枡
- WXsend() {
+ async WXsend(obj) {
+ // if (this.WXradioSelected.length < 1 && obj.length < 1) {
+ // return this.$message.info('璇峰厛閫夋嫨宸ュ簭锛�')
+ // }
+ // console.log(this.WXform.orderstepqrcode === '', 6)
+ // if (this.WXform.orderstepqrcode === '') {
+ // return this.$message.info('璇峰厛杈撳叆宸ュ簭锛�')
+ // }
this.dialogTitle = '澶栧崗鍙戞枡'
this.dialogVisible = true
+
+ this.$nextTick(() => {
+ this.dialogForm.wo_code = obj.wo_code
+ this.dialogForm.partcode = obj.partnumber
+ this.dialogForm.partname = obj.partname
+ this.dialogForm.partspec = obj.partspec
+ this.dialogForm.stepname = obj.stepname
+ this.dialogForm.stepdesc = obj.stepdesc
+ this.dialogForm.planqty = obj.planqty
+ this.dialogForm.reportqty = obj.reportqty
+ this.dialogForm.noreportqty = obj.noreportqty
+ this.dialogForm.fqty = obj.startqty
+ this.dialogForm.stepcode = obj.stepcode
+ this.dialogForm.stepseq = obj.seq
+ })
+
+ await this.getMesOrderStepSelectWX()
+ await this.getMesOrderSelectUser()
},
// 澶栧崗鏀舵枡
- WXback() {
+ async WXback(obj) {
+ // if (this.WXform.orderstepqrcode === '') {
+ // return this.$message.info('璇峰厛杈撳叆宸ュ簭锛�')
+ // }
this.dialogTitle = '澶栧崗鏀舵枡'
this.dialogVisible = true
+
+ this.$nextTick(() => {
+ this.dialogForm.wo_code = obj.wo_code
+ this.dialogForm.partcode = obj.partnumber
+ this.dialogForm.partname = obj.partname
+ this.dialogForm.partspec = obj.partspec
+ this.dialogForm.stepname = obj.stepname
+ this.dialogForm.stepdesc = obj.stepdesc
+ this.dialogForm.planqty = obj.planqty
+ this.dialogForm.reportqty = obj.reportqty
+ this.dialogForm.noreportqty = obj.noreportqty
+ this.dialogForm.stepcode = obj.stepcode
+ if (obj.nextstepname === null || obj.nextstepcode === '') {
+ this.dialogForm.nextstepname = obj.stepname
+ this.dialogForm.nextstepcode = obj.stepcode
+ } else {
+ this.dialogForm.nextstepname = obj.nextstepname
+ this.dialogForm.nextstepcode = obj.nextstepcode
+ }
+ this.dialogForm.noputqty = obj.noputqty
+ this.dialogForm.stepseq = obj.seq
+ this.dialogForm.sqty = obj.startqty
+
+ this.dialogForm.startqtySum = obj.startqty
+ })
+ await this.getMesOrderStepSelectWX()
+ await this.getMesOrderSelectUser()
+ await this.getMesOrderStepSelectCause('WX')
+ },
+ // 鐢熶骇鐝粍涓嬫媺鏀瑰彉
+ usergroupChange(val) {
+ this.dialogForm.usergroupcode = val
+ this.getUserTableData()
+ },
+ // 鑾峰彇鑷埗鎶ュ伐鐢熶骇鐝粍涓嬫媺鍒楄〃
+ async getMesOrderStepReportSelectUserGroup() {
+ const { data: res } = await MesOrderStepReportSelectUserGroup()
+ this.ZZtreams = res
+ },
+ // 鑾峰彇鑷埗鎶ュ伐琛ㄦ牸user鎵�鏈�
+ async getMesOrderSelectUserZZ() {
+ const { data: res } = await MesOrderSelectUser({ usercode: this.dialogForm.usergroupcode })
+ this.ZZuserArr = res
+ },
+ // 鑾峰彇鑷埗鐢熶骇璁惧涓嬫媺
+ async getMesOrderStepStartSelectEqp() {
+ const { data: res } = await MesOrderStepStartSelectEqp({ orderstepqrcode: this.form.orderstepqrcode })
+ this.ZZeqpArr = res
+ },
+ // 鑾峰彇WX渚涙柟鎺ュ彛
+ async getMesOrderStepSelectWX() {
+ const { data: res } = await MesOrderStepSelectWX({ orderstepqrcode: this.WXform.orderstepqrcode })
+ this.WXouterprovide = res
+ },
+ // 鑾峰彇鏀跺彂鏂欎汉鍛樹笅鎷夋帴鍙�
+ async getMesOrderSelectUser() {
+ const { data: res } = await MesOrderSelectUser({ usercode: this.dialogForm.outuser })
+ this.WXoutuser = res
+ },
+ // 鑾峰彇鏀舵枡涓嶈壇鍘熷洜涓嬫媺
+ async getMesOrderStepSelectCause(val) {
+ let orderstepqrcode = ''
+ if (val === 'WX') {
+ orderstepqrcode = this.WXform.orderstepqrcode
+ }
+ if (val === 'ZZ') {
+ orderstepqrcode = this.form.orderstepqrcode
+ }
+ const { data: res } = await MesOrderStepSelectCause({ orderstepqrcode: orderstepqrcode })
+ this.badArr = res
},
// 鎶ュ伐鏌ヨ鐢ㄦ埛琛�
async getUserTableData() {
- // const res = await MesOrderGroupSelectUser({usergroupcode:this.})
+ const { data: res } = await MesOrderGroupSelectUser({ usergroupcode: this.dialogForm.usergroupcode })
+ this.userTableData = res
this.userTableData.forEach(item => {
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
@@ -732,7 +1236,8 @@
userAdd() {
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
- this.userTableData.unshift({ name: '', isVisible: 1, number: number })
+ console.log(this.userTableData, 6)
+ this.userTableData.unshift({ usercode: '', username: '', isVisible: 1, number: number })
},
// 鐢ㄦ埛鍒楄〃鍒犻櫎
userDel(row) {
@@ -758,59 +1263,242 @@
}
})
},
- // 閲嶇疆
- reset() {
- this.dialogTitle = ''
- this.form.OrgCode = ''
- this.form.OrgName = ''
- this.form.OrgType = ''
- this.form.UserName = ''
- this.getMesOrderStepSearch()
+ // 鐢ㄦ埛鍒楄〃浜哄憳鍚嶇О鍊奸�変腑
+ usernameChange(val, row) {
+ this.userTableData.forEach(item => {
+ if (item.usercode === val) {
+ this.userIsSave = true
+ return this.$message.info('姝や汉鍛樺凡鍦ㄥ垪涓紒')
+ }
+ if (item.number === row.number) {
+ this.userIsSave = false
+ item.usercode = val
+ item.username = this.ZZuserArr.find(item => item.usercode === val).username
+ }
+ })
},
-
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
+ this.dialogForm.wo_code = '', // 宸ュ崟缂栧彿
+ this.dialogForm.partcode = '', // 浜у搧缂栫爜
+ this.dialogForm.partname = '', // 浜у搧鍚嶇О
+ this.dialogForm.partspec = '', // 浜у搧瑙勬牸
+ this.dialogForm.stepseq = '', // 宸ュ簭搴忓彿
+ this.dialogForm.stepcode = '', // 宸ュ簭缂栫爜
+ this.dialogForm.stepname = '', // 褰撳墠宸ュ簭鍚�
+ this.dialogForm.nextstepname = '', // 涓嬩竴閬撳伐搴忓悕
+ this.dialogForm.stepdesc = '', // 宸ュ簭鎻忚堪
+ this.dialogForm.planqty = '', // 浠诲姟鏁伴噺
+ this.dialogForm.reportqty = '', // 宸叉姤鏁伴噺
+ this.dialogForm.noreportqty = '', // 鏈姤鏁伴噺
+ this.dialogForm.startqty = '', // 寮�(鎶�)宸ユ暟閲�
+
+ this.dialogForm.wxcode = '', // 澶栧崗渚涘簲鍟嗙紪鐮�
+ this.dialogForm.outuser = '', // 鍙戞枡浜哄憳
+ this.dialogForm.taskqty = '', // 浠诲姟鏁伴噺
+ this.dialogForm.fqty = '', // 鍙戞枡鏁伴噺
+
+ this.dialogForm.inuser = '', // 鏀舵枡浜哄憳
+ this.dialogForm.sqty = '', // 鏀舵枡鏁伴噺
+ this.dialogForm.ngqty = '', // 涓嶈壇鏁伴噺
+ this.dialogForm.badcode = '', // 涓嶈壇鍘熷洜缂栫爜
+
+ this.dialogForm.noputqty = '', // 涓嶈壇鏁伴噺
+
+ this.dialogForm.eqpcode = '', // 鐢熶骇璁惧缂栫爜
+
+ this.dialogForm.usergroupcode = '', // 鐝粍缂栫爜
+ this.dialogForm.reportuser = '', // 鎶ュ伐浜哄憳
+
+ this.dialogForm.startqtySum = '' // 涓嶈兘瓒呰繃鐨勬暟鍊�
+
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
this.dialogVisible = false
- // if (this.dialogTitle === '鑷埗寮�濮�'||this.dialogTitle === '鑷埗鎶ュ伐') {
- // this.tabClick('0')
- // }
- // if (this.dialogTitle === '澶栧崗鍙戞枡'||this.dialogTitle === '澶栧崗鏀舵枡') {
- // this.tabClick('1')
- // }
this.tabClick()
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
- // this.$refs.dialogForm.validate(valid => {
- // if (valid) {
- // const data = {
- // OrganCode: this.dialogForm.OrgCode,
- // OrganName: this.dialogForm.OrgName,
- // Operator: getCookie('admin')
- // }
- // // this.tabClick()
- // // AddUpdateOrganization(data).then(res => {
- // // if (res.code === '200') {
- // // // this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- // // this.dialogVisible = false
- // // this.getMesOrderStepSearch()
- // // } else {
- // // // this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- // // }
- // // })
- // }
- // })
- this.tabClick()
- this.dialogVisible = false
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ if (this.dialogTitle === '澶栧崗鍙戞枡') {
+ if (parseFloat(this.dialogForm.fqty) > parseFloat(this.dialogForm.noreportqty)) {
+ return this.$message.info('鍙戞枡鏁伴噺涓嶈兘澶т簬鏈彂鏁伴噺!')
+ }
+ const data = {
+ mesordercode: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
+ partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
+ stepseq: this.dialogForm.stepseq, // 宸ュ簭搴忓彿 鏆傛椂缂�
+ stepcode: this.dialogForm.stepcode, // 宸ュ簭缂栫爜
+ wxcode: this.dialogForm.wxcode, // 澶栧崗渚涘簲鍟嗙紪鐮�
+ outuser: this.dialogForm.outuser, // 鍙戞枡浜哄憳
+ taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
+ fqty: this.dialogForm.fqty // 鍙戞枡鏁伴噺
+ }
+ SavaMesOrderStepOut(data).then(res => {
+ if (res.code === '200') {
+ this.$message.success('鍙戞枡鎴愬姛锛�')
+ this.dialogVisible = false
+ this.tabClick()
+ } else {
+ this.$message.error('鍙戞枡澶辫触!')
+ }
+ })
+ }
+
+ if (this.dialogTitle === '澶栧崗鏀舵枡') {
+ if (parseFloat(this.dialogForm.startqtySum) < parseFloat(this.dialogForm.sqty) + parseFloat(this.dialogForm.noputqty)) {
+ return this.$message.info('鏀舵枡鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庝簡鏈敹鏁伴噺!')
+ }
+
+ if (parseFloat(this.dialogForm.noputqty) > 0) {
+ if (this.dialogForm.badcode.length < 1) {
+ return this.$message.info('璇烽�夋嫨涓嶈壇鍘熷洜锛�')
+ }
+ }
+
+ const data = {
+ mesordercode: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
+ partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
+ stepseq: this.dialogForm.stepseq, // 宸ュ簭搴忓彿
+ stepcode: this.dialogForm.stepcode, // 宸ュ簭缂栫爜
+ wxcode: this.dialogForm.wxcode, // 澶栧崗渚涘簲鍟嗙紪鐮�
+ inuser: this.dialogForm.inuser, // 鍙戞枡浜哄憳
+ taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
+ sqty: this.dialogForm.sqty, // 鏀舵枡鏁伴噺
+ ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
+ badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
+ }
+ SavaMesOrderStepIn(data).then(res => {
+ if (res.code === '200') {
+ this.WXprint2()
+ this.$message.success('鏀舵枡鎴愬姛锛�')
+ this.dialogVisible = false
+ this.dialogVisible2 = true
+ this.tabClick()
+ } else {
+ this.$message.error('鏀舵枡澶辫触!')
+ }
+ })
+ }
+
+ if (this.dialogTitle === '鑷埗寮�濮�') {
+ const data = {
+ mesordercode: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
+ partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
+ stepseq: this.dialogForm.stepseq, // 宸ュ簭搴忓彿 鏆傛椂缂�
+ stepcode: this.dialogForm.stepcode, // 宸ュ簭缂栫爜
+ eqpcode: this.dialogForm.eqpcode, // 鐢熶骇璁惧
+ taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
+ startqty: this.dialogForm.startqty// 寮�濮嬫暟閲�
+ }
+ SavaMesOrderStepStart(data).then(res => {
+ if (res.code === '200') {
+ this.$message.success('寮�宸ユ垚鍔燂紒')
+ this.dialogVisible = false
+ this.tabClick()
+ } else {
+ this.$message.error('寮�宸ュけ璐�!')
+ }
+ })
+ }
+
+ if (this.dialogTitle === '鑷埗鎶ュ伐') {
+ if (parseFloat(this.dialogForm.startqtySum) < parseFloat(this.dialogForm.startqty) + parseFloat(this.dialogForm.noputqty)) {
+ return this.$message.info('鎶ュ伐鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庝簡鏈姤鏁伴噺!')
+ }
+ if (this.userTableData.length < 1) {
+ return this.$message.info('浜哄憳鍒楄〃涓嶈兘涓虹┖!')
+ }
+
+ if (parseFloat(this.dialogForm.noputqty) > 0) {
+ if (this.dialogForm.badcode.length < 1) {
+ return this.$message.info('璇烽�夋嫨涓嶈壇鍘熷洜锛�')
+ }
+ }
+
+ const reportuser = this.userTableData.map(item => item.usercode).join(';')
+ const data = {
+ mesordercode: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
+ partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
+ stepseq: this.dialogForm.stepseq, // 宸ュ簭搴忓彿
+ stepcode: this.dialogForm.stepcode, // 宸ュ簭缂栫爜
+ eqpcode: this.dialogForm.eqpcode, // 璁惧缂栫爜
+ usergroupcode: this.dialogForm.usergroupcode, // 鐝粍缂栫爜
+ reportuser: reportuser, // 鎶ュ伐浜哄憳
+ taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
+ // startqty: this.dialogForm.startqty, // 寮�宸ユ暟閲�
+ startqty: this.dialogForm.reportqty, // 寮�宸ユ暟閲�
+ // reportqty: this.dialogForm.reportqty, // 鎶ュ伐鏁伴噺
+ reportqty: this.dialogForm.startqty, // 鎶ュ伐鏁伴噺
+ ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
+ badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
+ }
+
+ SavaMesOrderStepReport(data).then(res => {
+ if (res.code === '200') {
+ this.ZZprint2()
+ this.$message.success('鎶ュ伐鎴愬姛锛�')
+ this.dialogVisible = false
+ this.dialogVisible2 = true
+ this.tabClick()
+ } else {
+ this.$message.error('鎶ュ伐澶辫触!')
+ }
+ })
+ }
+ }
+ })
},
+ // 鐢熸垚浜岀淮鐮�
+ bindQRCode(text) {
+ new QRCode(this.$refs.qrCodeDiv2, {
+ text: text,
+ width: 50,
+ height: 50,
+ colorDark: '#000', // 浜岀淮鐮侀鑹�
+ colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
+ correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H
+ })
+ },
+ ZZprint2() {
+ this.qrForm.qrvalue = this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode
+ this.qrForm.startqty = this.dialogForm.startqty
+ this.qrForm.wo_code = this.dialogForm.wo_code
+ this.qrForm.partcode = this.dialogForm.partcode
+ this.qrForm.partname = this.dialogForm.partname
+ this.qrForm.nextstepname = this.dialogForm.nextstepname
+
+ this.$nextTick(() => {
+ this.bindQRCode(this.qrForm.qrvalue)
+ console.log(this.$refs.qrCodeDiv2, 123)
+ // console.log(this.$refs.qrCodeDiv2.querySelectorAll('#qrCode2>img'), 1)
+ // console.log(this.$refs.qrCodeDiv2.querySelectorAll('#qrCode2>canvas'), 2)
+ })
+ },
+ WXprint2() {
+ this.qrForm.qrvalue = this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode
+ this.qrForm.startqty = this.dialogForm.sqty
+ this.qrForm.wo_code = this.dialogForm.wo_code
+ this.qrForm.partcode = this.dialogForm.partcode
+ this.qrForm.partname = this.dialogForm.partname
+ this.qrForm.nextstepname = this.dialogForm.nextstepname
+ this.$nextTick(() => {
+ this.bindQRCode(this.qrForm.qrvalue)
+ })
+ },
+ dialogVisible2Close() {
+ this.qrForm.qrvalue = ''
+ this.qrForm.startqty = ''
+ this.qrForm.wo_code = ''
+ this.qrForm.partcode = ''
+ this.qrForm.partname = ''
+ this.qrForm.nextstepname = ''
+ this.$refs.qrCodeDiv2 = ''
+ },
+
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
@@ -986,12 +1674,26 @@
border-color: $main_color;
}
-.dialogVisible{
- ::v-deep .el-select .el-input .el-select__caret {
- display: flex;
- align-items: center;
- justify-content: center;
+//.dialogVisible{
+::v-deep .el-select .el-input .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+//}
+.elTableDiv {
+ ::v-deep .el-radio__label {
+ display: none;
}
}
+</style>
+<style media="print">
+/*@media print {*/
+@page {
+ size: auto;
+ margin: 3mm;
+ font-size: 10px;
+}
</style>
--
Gitblit v1.9.3