From f29627ec7bee0fe77411cbcd49b8b5a971c32b01 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期一, 20 十月 2025 11:20:53 +0800
Subject: [PATCH] 下拉框显示完工工单状态
---
pages/index.vue | 230 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 121 insertions(+), 109 deletions(-)
diff --git a/pages/index.vue b/pages/index.vue
index 523eaf4..0cf47f2 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -12,13 +12,13 @@
璋冩満閫佹
</view>
<view class="tab-item" :class="{ active: currentTab === 2 }" @click="changeTab(2)">
- 鎹㈡ā
+ 鍒�鍏风鐞�
+ </view>
+ <view class="tab-item" :class="{ active: currentTab === 4 }" @click="changeTab(4)">
+ 鐢熶骇鎶ュ伐
</view>
<view class="tab-item" :class="{ active: currentTab === 1 }" @click="changeTab(1)">
寮�宸ュ畬宸�
- </view>
- <view class="tab-item" :class="{ active: currentTab === 4 }" @click="changeTab(4)">
- 鎵撶爜鎶ュ伐
</view>
<view class="tab-item" :class="{ active: currentTab === 5 }" @click="changeTab(5)">
e-SOP
@@ -39,24 +39,21 @@
<button class="refresh-btn" @click="refresh">鍒锋柊</button>
</view>
<view>
- <h4>涓�骞呮ā鍏峰悓鏃跺紑宸ュ涓伐鍗曡缃�</h4>
+ <h4>涓�鍙版満鍙板彧鑳介�夋嫨涓�鏉″伐鍗曪紙澶氶�夐粯璁や负鏈�鍚庝竴鏉★級</h4>
</view>
<view class="section top-section">
<view class="form-row">
<view>
- <!-- <label
- style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px">绗竴姝ラ�夋嫨鏈哄彴:</label> -->
- <!-- <superwei-combox :candidates="machineList" placeholder="璇烽�夋嫨" v-model="machineName"
- @select="onMachineChange" class="picker"></superwei-combox> -->
- <input v-model="machineName" disabled="true" type="text"
- style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px" />
+ <!-- <label style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px">绗竴姝ラ�夋嫨鏈哄彴:</label> -->
+ <!-- <superwei-combox :candidates="machineList" placeholder="璇烽�夋嫨" v-model="machineName"
+ @select="onMachineChange" class="picker"></superwei-combox> -->
+ <input v-model="machineName" disabled="true" type="text" style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px" />
</view>
</view>
<view class="form-row">
<view>
- <label
- style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px;">绗竴姝ラ�夋嫨宸ュ崟:</label>
+ <label style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px;">绗竴姝ラ�夋嫨宸ュ崟:</label>
<button class="print-btn" @click="isShowTab">閫夋嫨宸ュ崟</button>
</view>
</view>
@@ -81,7 +78,7 @@
</uni-tr>
<uni-tr v-for="(item, index) in isShowTableData" :key="index">
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.PROC_NAME" /><!--宸ュ簭-->
+ <input class="form-input" disabled="true" type="text" v-model="item.procName" /><!--宸ュ簭-->
</uni-td>
<uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.daa001" />
@@ -90,10 +87,10 @@
<input class="form-input" disabled="true" type="text" v-model="item.daa002" />
</uni-td>
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.DAA003" /><!--浜у搧鍚嶇О-->
+ <input class="form-input" disabled="true" type="text" v-model="item.daa003" /><!--浜у搧鍚嶇О-->
</uni-td>
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.DAA004" /><!--瑙勬牸-->
+ <input class="form-input" disabled="true" type="text" v-model="item.daa004" /><!--瑙勬牸-->
</uni-td>
<uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.daa011" /><!--宸茬敓浜ф暟閲�-->
@@ -111,7 +108,7 @@
<input class="form-input" disabled="true" type="text" v-model="item.daa018" /><!--宸ュ崟鐘舵��-->
</uni-td>
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.STAFF_NAME" /><!--鎶ュ伐浜�-->
+ <input class="form-input" disabled="true" type="text" v-model="item.staffName" /><!--鎶ュ伐浜�-->
</uni-td>
<uni-td>
<view class="uni-group">
@@ -130,8 +127,7 @@
<view>
<text style="color: red;">
- 璇存槑:鍒濆鐘舵�佹槸锛屾寜娉ㄥ鏈烘煡鍑烘墍鏈夌殑鏈畬宸ョ殑宸ュ崟銆傜敤閫夋嫨妗嗘爣璇嗘満鍣ㄨ寮�宸ョ殑宸ュ崟.
- 鍙互鍚屾椂寮�宸ュ涓伐鍗曪紝浣嗗繀椤绘ā鍏锋槸涓�濂椼�傞�夋嫨瀹屾垚锛岀偣鍑讳繚瀛橀�夋嫨銆傜郴缁熶繚鐣欓�変腑鐨勫伐鍗曘��
+ 璇存槑:鍙兘鍚屾椂寮�宸ヤ竴涓伐鍗曘�傞�夋嫨瀹屾垚锛岀偣鍑讳繚瀛橀�夋嫨銆傜郴缁熶繚鐣欓�変腑鐨勫伐鍗曘��
濡傛灉瑕侀噸閫夛紝鐐瑰嚮娓呯┖閲嶉�夊姛鑳姐��
</text>
</view>
@@ -139,7 +135,7 @@
</view>
<view v-if="currentTab === 0" class="tab-content">
<WorkOrder :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo"
- :deviceNumber="machineName" />
+ :deviceNumber="machineName" />
</view>
<view v-if="currentTab === 1" class="tab-content">
<!-- <!– 璋冪敤 WorkOrderStatus 缁勪欢 –>-->
@@ -170,69 +166,78 @@
</scroll-view>
+ <!-- 寮圭獥涓嬫媺妗嗗彧鏄剧ず宸ュ崟鐘舵�� -->
<view v-if="isShow" class="overlay">
<view class="popup">
<view class="form-row">
<view>
- <label style="float: left;margin-top: 18px;">閫夋嫨褰撳墠妯″叿鍙�:</label>
+ <label style="float: left;margin-top: 18px;">閫夋嫨宸ュ崟鐘舵��:</label>
<superwei-combox :candidates="engineeringNoMapList" placeholder="璇烽�夋嫨" v-model="engineeringNo"
- @select="onEngineeringNoChange" class="picker"
- style="padding: 7px 46px;width: 650px;"></superwei-combox>
+ @select="onEngineeringNoChange" class="picker"
+ style="padding: 7px 46px;width: 650px;"></superwei-combox>
</view>
</view>
- <view class="section card">
- <uni-table ref="table" type="selection" border stripe emptyText="鏆傛棤鏇村鏁版嵁"
- @selection-change="selectionChange">
- <uni-tr>
- <uni-th align="center" class="th" style="color: #FFFFFF">宸ュ簭</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF">宸ュ崟鍙�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF">浜у搧缂栫爜</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF">浜у搧鍚嶇О</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF">瑙勬牸</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸茬敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">鏈敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">娲惧伐鏁伴噺</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸ュ崟鏁伴噺</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸ュ崟鐘舵��</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">鎶ュ伐浜�</uni-th>
- </uni-tr>
- <uni-tr v-for="(item, index) in tableData" :key="index">
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.PROC_NAME" /><!--宸ュ簭-->
- </uni-td>
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa001" />
- </uni-td>
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa002" />
- </uni-td>
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.DAA003" /><!--浜у搧鍚嶇О-->
- </uni-td>
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.DAA004" /><!--瑙勬牸-->
- </uni-td>
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa011" /><!--宸茬敓浜ф暟閲�-->
- </uni-td>
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" :value="(item.daa008 || 0) - (item.daa011 || 0)" /><!--鏈敓浜ф暟閲�-->
- </uni-td>
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--娲惧伐鏁伴噺-->
- </uni-td>
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--宸ュ崟鏁伴噺-->
- </uni-td>
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa018" /><!--宸ュ崟鐘舵��-->
- </uni-td>
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.STAFF_NAME" /><!--鎶ュ伐浜�-->
- </uni-td>
- </uni-tr>
- </uni-table>
- </view>
+
+ <div style="height: 400px; overflow: auto;">
+ <table>
+
+ <view class="section card">
+ <uni-table ref="table" type="selection" border stripe emptyText="鏆傛棤鏇村鏁版嵁"
+ @selection-change="selectionChange">
+ <uni-tr>
+ <uni-th align="center" class="th" style="color: #FFFFFF">宸ュ簭</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF">宸ュ崟鍙�</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF">浜у搧缂栫爜</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF">浜у搧鍚嶇О</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF">瑙勬牸</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸茬敓浜ф暟閲�</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">鏈敓浜ф暟閲�</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">娲惧伐鏁伴噺</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸ュ崟鏁伴噺</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸ュ崟鐘舵��</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">鎶ュ伐浜�</uni-th>
+ </uni-tr>
+ <uni-tr v-for="(item, index) in tableData" :key="index">
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.procName" /><!--宸ュ簭-->
+ </uni-td>
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa001" />
+ </uni-td>
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa002" />
+ </uni-td>
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa003" /><!--浜у搧鍚嶇О-->
+ </uni-td>
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa004" /><!--瑙勬牸-->
+ </uni-td>
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa011" /><!--宸茬敓浜ф暟閲�-->
+ </uni-td>
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" :value="(item.daa008 || 0) - (item.daa011 || 0)" /><!--鏈敓浜ф暟閲�-->
+ </uni-td>
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--娲惧伐鏁伴噺-->
+ </uni-td>
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--宸ュ崟鏁伴噺-->
+ </uni-td>
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa018" /><!--宸ュ崟鐘舵��-->
+ </uni-td>
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.staffName" /><!--鎶ュ伐浜�-->
+ </uni-td>
+ </uni-tr>
+ </uni-table>
+ </view>
+
+ </table>
+ </div>
+
<view class="bottom-section">
<button class="save-btn" @click="save">淇濆瓨閫夋嫨</button>
<button class="cancel-btn" @click="isShow = !isShow">鍙栨秷</button>
@@ -269,7 +274,11 @@
},
data() {
return {
+ orderStatus: '', // 榛樿鍏ㄩ儴
currentTab: 7,
+
+ productCode: '', // 浜у搧缂栫爜
+ productSpec: '', // 浜у搧瑙勬牸
machineList: [],
@@ -460,14 +469,14 @@
return;
}
- let firstValue = data[0]["moldId"]; // 鑾峰彇绗竴涓璞＄殑鎸囧畾灞炴�у��
+ //let firstValue = data[0]["moldId"]; // 鑾峰彇绗竴涓璞＄殑鎸囧畾灞炴�у��
- // 浣跨敤 every 鏂规硶妫�鏌ユ墍鏈夊璞＄殑璇ュ睘鎬у�兼槸鍚︿竴鑷�
- let flag = data.every(item => item["moldId"] === firstValue);
- if (!flag) {
- this.$showMessage("閫夊彇鐨�" + data.length + "涓伐鍗曚腑鐨勬ā鍏风紪鍙蜂笉涓�鑷�");
- return;
- }
+ //// 浣跨敤 every 鏂规硶妫�鏌ユ墍鏈夊璞＄殑璇ュ睘鎬у�兼槸鍚︿竴鑷�
+ //let flag = data.every(item => item["moldId"] === firstValue);
+ //if (!flag) {
+ // this.$showMessage("閫夊彇鐨�" + data.length + "涓伐鍗曚腑鐨勬ā鍏风紪鍙蜂笉涓�鑷�");
+ // return;
+ //}
let orderSelect = [];
@@ -492,7 +501,8 @@
if (res.data.tbBillList) {
this.getWomdaaIsShow();
uni.showToast({
- title: '灏嗘敞濉戞満寮�鍚堟ā鏁版竻0',
+ title: '淇濆瓨宸ュ崟鎴愬姛',
+ //title: '灏嗘敞濉戞満寮�鍚堟ā鏁版竻0',
//灏嗗�艰缃负 success 鎴栬�呯洿鎺ヤ笉鐢ㄥ啓icon杩欎釜鍙傛暟
icon: 'success',
//鏄剧ず鎸佺画鏃堕棿涓� 5绉�
@@ -560,12 +570,8 @@
return `${year}-${month}-${day}`; // 杩斿洖鏍煎紡鍖栧悗鐨勫瓧绗︿覆
},
selectionChange(e) {
- // 鍙繚鐣欐渶鍚庝竴涓�変腑鐨勫伐鍗�
- if (Array.isArray(e.detail.index)) {
- this.selectedIndexs = [e.detail.index[e.detail.index.length - 1]];
- } else {
- this.selectedIndexs = [e.detail.index];
- }
+ // 鍗曢�夌洿鎺ヨ祴鍊�
+ this.selectedIndexs = [e.detail.index];
},
selectedItems() {
@@ -647,11 +653,16 @@
this.engineeringNo = null;
this.tableData = [];
-
- this.GetWomdaasByEngineeringNo();
- //this.getWomdaa();
+ // 涓嬫媺妗嗗彧鏄剧ず宸ュ崟鐘舵��
+ this.engineeringNoMapList = ['寰呭紑宸�', '鏈紑宸�', '寮�宸�', '鏆傚仠','瀹屽伐'];
+ // 榛樿鏄剧ず鍏ㄩ儴宸ュ崟
+ this.getWomdaa();
},
-
+ // 涓嬫媺妗嗛�変腑鍚庯紝鎸夌姸鎬佺瓫閫夊伐鍗�
+ onEngineeringNoChange(status) {
+ this.engineeringNo = status;
+ this.getWomdaaByStatus();
+ },
getWomdaa() {
let editDate = this.formatDate(new Date());
@@ -660,30 +671,31 @@
url: "/Womdaa/GetWomdaasByMachine",
data: {
machineNo: this.machineNo,
- engineeringNo: this.engineeringNo,
editDate: editDate
}
}).then(res => {
this.tableData = res.data.tbBillList;
})
},
- GetWomdaasByEngineeringNo() {
-
- this.$post({
- url: "/Womdaa/GetWomdaasByEngineeringNo",
- data: {
- machineNo: this.machineNo
- }
- }).then(res => {
- this.engineeringNoList = res.data.tbBillList;
- this.engineeringNoMapList = this.engineeringNoList.map(s => s.moldId + ":" + s.moldName + ":" +
- s.moldModel
- );
- });
- },
+ // 鎸夊伐鍗曠姸鎬佺瓫閫夊伐鍗�
+ getWomdaaByStatus() {
+ let editDate = this.formatDate(new Date());
+ this.$post({
+ url: "/Womdaa/GetWomdaasByEngineeringNo",
+ data: {
+ machineNo: this.machineNo,
+ orderStatus: [this.engineeringNo], // 鍙紶閫変腑鐨勭姸鎬�
+ editDate: editDate
+ }
+ }).then(res => {
+ this.tableData = res.data.tbBillList;
+ });
+ },
toDetail(item) {
this.orderId = item.id;
this.selectedOrder = item.daa001;
+ this.productCode = item.daa002; // 浜у搧缂栫爜
+ this.productSpec = item.daa004; // 浜у搧瑙勬牸
this.currentTab = 0;
}
},
--
Gitblit v1.9.3