From b4c354b235a7755b62e941c6ae30291d1f9a3f8f Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期四, 07 八月 2025 19:21:32 +0800
Subject: [PATCH] 来料检修改
---
manifest.json | 2 +-
pages/QC/LLJ/Add.vue | 30 ++++++++++++++++++++----------
store/index.js | 4 ++--
3 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/manifest.json b/manifest.json
index f129550..6aa82a6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "GS-MES-AP",
"appid" : "__UNI__F08FAE3",
"description" : "",
- "versionName" : "1.1.2.7",
+ "versionName" : "1.1.2.9",
"versionCode" : 1,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
diff --git a/pages/QC/LLJ/Add.vue b/pages/QC/LLJ/Add.vue
index 89c2ef6..12abf50 100644
--- a/pages/QC/LLJ/Add.vue
+++ b/pages/QC/LLJ/Add.vue
@@ -72,6 +72,7 @@
<option value="瑁呴厤涓嶈壇">瑁呴厤涓嶈壇</option>
<option value="瀹夎涓嶈壇">瀹夎涓嶈壇</option>
</select>
+ <view v-else class="info-value">{{ badreason }}</view>
</view>
<view class="dropdown-row">
<view class="info-label">鎵�灞炶溅闂达細</view>
@@ -82,6 +83,7 @@
<option value="娉ㄥ杞﹂棿">娉ㄥ杞﹂棿</option>
<option value="鍏朵粬">鍏朵粬</option>
</select>
+ <view v-else class="info-value">{{ WORKSHOP }}</view>
</view>
<view class="dropdown-row">
<view class="info-label">璇勫鐘舵�侊細</view>
@@ -91,8 +93,8 @@
<option value="鎸戦��/杩斿伐浣跨敤">鎸戦��/杩斿伐浣跨敤</option>
<option value="閫�璐�">閫�璐�</option>
<option value="寰呭垽">寰呭垽</option>
-
</select>
+ <view v-else class="info-value">{{ PSTYPE }}</view>
</view>
<view class="info-block" style="margin-top: 10px;">
<view class="info-label">澶囨敞锛�</view>
@@ -561,7 +563,7 @@
console.log("瀹屾暣鐨勬彁浜ゆ暟鎹細", this.QcIssueResultDetailes);
const url = this.$store.state.serverInfo.serverAPI+`/QcIssueResult/GetProcessNo`;
- if (this.PSTYPE === '鐗归噰/璁╂浣跨敤') {// 鍙戦�� POST 璇锋眰
+ if (this.PSTYPE === '寰呭垽') {// 鍙戦�� POST 璇锋眰
uni.request({
url: url, // 璇锋眰鍦板潃
method: 'POST', // 璇锋眰鏂规硶
@@ -678,14 +680,16 @@
...data,
emergencyStatus: data.emergency === 1 || data.emergency === "1" || data.emergency === true
};
+ // 鍏抽敭锛氳祴鍊煎埌椤甸潰缁戝畾鍙橀噺
+ this.badreason = data.blyy || '';
+ this.PSTYPE = data.pszt || '';
+ this.WORKSHOP = data.sscj || '';
+ console.log('璧嬪�煎悗', this.badreason, this.PSTYPE, this.WORKSHOP);
// 纭繚PHSY瀛楁琚纭缃�
this.formData.PHSY = data.PHSY;
console.log("鍔犺浇鐨勭揣鎬ユ斁琛岀姸鎬�:", this.formData.emergencyStatus);
- this.badreason = data.blyy;
- this.PSTYPE = data.pszt;
- this.WORKSHOP = data.sscj;
this.$post({
url: "/LLJ/getJYItem",
data: {
@@ -1279,14 +1283,16 @@
}
}
- // 淇濆瓨鐮村潖瀹為獙鏁伴噺
+ // 淇濆瓨鐮村潖瀹為獙鏁伴噺锛屽苟甯︿笂涓嶈壇鍘熷洜銆佹墍灞炶溅闂淬�佽瘎瀹＄姸鎬�
this.$post({
url: "/LLJ/saveRemarksGid",
data: {
gid: this.formData.id,
releaseNo: this.formData.releaseNo,
- PHSY: this.PHSY // 鍙互鏄┖瀛楃涓叉垨鏈夋晥鏁存暟
- // 涓嶅啀鍖呭惈remarks瀛楁
+ PHSY: this.PHSY, // 鍙互鏄┖瀛楃涓叉垨鏈夋晥鏁存暟
+ BLYY: this.badreason,
+ SSCJ: this.WORKSHOP,
+ PSZT: this.PSTYPE
}
}).then(res => {
if (res.data.tbBillList > 0) {
@@ -1308,7 +1314,10 @@
data: {
gid: this.formData.id,
releaseNo: this.formData.releaseNo,
- PHSY: '' // 绌哄瓧绗︿覆锛屽悗绔細澶勭悊涓簄ull
+ PHSY: '', // 绌哄瓧绗︿覆锛屽悗绔細澶勭悊涓簄ull
+ BLYY: this.badreason,
+ SSCJ: this.WORKSHOP,
+ PSZT: this.PSTYPE
}
}).then(res => {
if (res.data.tbBillList > 0) {
@@ -1864,7 +1873,8 @@
releaseNo: this.formData.releaseNo,
BLYY: this.badreason,
SSCJ: this.WORKSHOP,
- PSZT: this.PSTYPE
+ PSZT: this.PSTYPE,
+ PHSY: this.PHSY // 鏂板锛屼繚璇佺牬鍧忓疄楠屾暟涓嶄細琚埛鎺�
}
}).then(res => {
if (res.data.tbBillList > 0) {
diff --git a/store/index.js b/store/index.js
index 3fb8f02..d50ed24 100644
--- a/store/index.js
+++ b/store/index.js
@@ -10,9 +10,9 @@
networkFlag:'鍐呯綉',
serverURLInt:'http://192.168.11.251:10055',//鏈嶅姟鍣ㄤ綋妫� 10.0.1.104:10054
serverURL:'http://localhost:10055',//鏈湴璋冭瘯鍦板潃
- serverAPI:'http://localhost:5184/api',//褰撳墠姝ｅ湪浣跨敤鐨勬湇鍔″櫒,榛樿涓哄缃� localhost
+ //serverAPI:'http://localhost:5184/api',//褰撳墠姝ｅ湪浣跨敤鐨勬湇鍔″櫒,榛樿涓哄缃� localhost
//serverAPI:'http://192.168.1.22:10054/api',//鍐呯綉
- //serverAPI:'http://36.26.21.214:10055/api',
+ serverAPI:'http://36.26.21.214:10055/api',
ftpServer:'ftp://36.26.21.214',//FTP鏈嶅姟鍣ㄥ湴鍧�
}
},
--
Gitblit v1.9.3