From 2565d78042b7cc5ac500c4bac5edefdb7a046af5 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期三, 17 九月 2025 14:04:52 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~cnf/HM_StandardPda-Browse
---
pages/QC/XJ/Add.vue | 394 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 391 insertions(+), 3 deletions(-)
diff --git a/pages/QC/XJ/Add.vue b/pages/QC/XJ/Add.vue
index f8ba422..cc44bef 100644
--- a/pages/QC/XJ/Add.vue
+++ b/pages/QC/XJ/Add.vue
@@ -97,7 +97,7 @@
<view v-if="item.result==null || item.result=='鏈畬鎴�'" class="watermark pending">
{{ getStatusText(item.result) }}
</view>
- <view class="description-text">{{ item.projName }}</view>
+ <view class="description-text">{{ getInspectionDescription(item) }}</view>
</td>
<td>
<button v-if="item.isCheck >= item.levelNum" class="record-btn" @click="toDetail(item)">鏌ョ湅</button>
@@ -119,6 +119,12 @@
<!-- 宸叉湁鍗曟嵁鐨勬搷浣滄寜閽� -->
<button class="action-btn secondary" v-if="!isUpdate && !isShowTable" @click="toImage">涓婁紶/鏌ョ湅鍥剧墖</button>
+ <button class="action-btn secondary" v-if="!isUpdate && !isShowTable" @click="fetchDrawingNumber(formData.itemNo)">
+ 璋冨彇PLM鍥剧焊
+ </button>
+ <button class="action-btn secondary" v-if="!isUpdate && !isShowTable" @click="getBom">
+ Bom鐢ㄦ枡娓呭崟
+ </button>
<button class="action-btn secondary" v-if="!isUpdate && !isShowTable" @click="viewAttachmentInfo">鏌ョ湅闄勪欢淇℃伅</button>
<button class="action-btn danger" v-if="!isUpdate && !formData.fcheckResu && !isShowTable && formData.fsubmit !== 1" @click="removeXJ">鍒犻櫎鍗曟嵁</button>
@@ -268,6 +274,61 @@
</div>
</view>
</view>
+
+
+ <view class="barcode">
+ <u-modal :show="itemShow" title="鐗╂枡鏄庣粏" @confirm="drawingConfirm" @cancel="itemCancel"
+ showCancelButton :z-index="1000">
+ <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁" style="margin-left: 5px;margin-right: 5px;height: 400px;max-height: 60vh;overflow-y: auto;">
+ <uni-tr>
+ <uni-th align="center">鏂欏彿</uni-th>
+ <uni-th align="center" width="90">鍚嶇О</uni-th>
+ <uni-th align="center" width="90">瑙勬牸鍨嬪彿</uni-th>
+ <uni-th align="center" width="150">璋冨彇PLM鍥剧焊</uni-th>
+ </uni-tr>
+ <uni-tr v-for="(item,index) in (drawing || [])" style="height: 100px;">
+ <uni-td align="center">{{item.itemNo}}</uni-td>
+ <uni-td align="center" >
+ <div >{{item.itemName}}</div>
+ </uni-td>
+ <uni-td align="center" >
+ <div>{{item.itemModel}}</div>
+ </uni-td>
+ <uni-td align="center" class="click-wd">
+ <div @click="fetchDrawingNumber(item.itemNo)">璋冨彇鍥剧焊</div>
+ </uni-td>
+ </uni-tr>
+ </uni-table>
+ </u-modal>
+ </view>
+
+ <view class="barcode">
+ <u-modal :show="drawingShow" title="鍥剧焊鏄庣粏" @confirm="drawingConfirm" @cancel="drawingCancel"
+ showCancelButton :z-index="1000">
+ <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁" style="margin-left: 5px;margin-right: 5px;height: 400px;max-height: 60vh;overflow-y: auto;">
+ <uni-tr>
+ <uni-th align="center">鐩稿叧鏂囨。</uni-th>
+ <uni-th align="center" width="90">鏈夋棤鍏宠仈PDF鏂囦欢</uni-th>
+ <uni-th align="center" width="90">鑳藉惁鎵撳紑鏂囦欢</uni-th>
+ <uni-th align="center" width="150">鎿嶄綔锛堢偣鍑伙級</uni-th>
+ </uni-tr>
+ <uni-tr v-for="(item,index) in (drawing || [])" style="height: 100px;">
+ <uni-td align="center">{{item.fName}}</uni-td>
+ <uni-td align="center" style="font-size:25px;">
+ <div v-if="item.fRelevantObject==' '" style="color: #E47470;">脳</div>
+ <div style="color: #90BA87;" v-else>鈭�</div>
+ </uni-td>
+ <uni-td align="center" style="font-size:25px;">
+ <div v-if="item.isSupported || item.fRelevantObject!=' '" style="color: #90BA87;">鈭�</div>
+ <div style="color: #E47470;" v-else>脳</div>
+ </uni-td>
+ <uni-td align="center" class="click-wd">
+ <div @click="openDrawings(item)">鎵撳紑鏂囨。</div>
+ </uni-td>
+ </uni-tr>
+ </uni-table>
+ </u-modal>
+ </view>
<!-- 鏂囦欢棰勮寮圭獥 -->
<view v-if="showFilePreviewPopup" class="overlay">
@@ -356,10 +417,16 @@
lineNo: "",
tableData: [],
+ drawing: [],
- isSubmit: true,
+ isSubmit: true,
- isUpdate: true,
+ isUpdate: true,
+
+ isShowTable: false,
+
+ drawingShow: false,
+ itemShow: false,
remarks: "",
remarksPopup: false,
@@ -443,6 +510,15 @@
return statusMap['approved'] || '鍚堟牸';
} else {
return statusMap['rejected'] || '涓嶅悎鏍�';
+ }
+ },
+
+ getInspectionDescription(item) {
+ // 鍙朓TEM_MOD瀛楁鐨勫��
+ if (item.itemMod && item.itemMod.trim() !== '') {
+ return item.itemMod;
+ } else {
+ return '妫�楠岄」鐩鎯�';
}
},
@@ -1028,6 +1104,318 @@
}
});
},
+
+ drawingConfirm() {
+ this.drawingShow = false
+ this.imageShow = false
+ this.productionShow = false
+ this.itemShow=false
+ },
+ drawingCancel() {
+ this.drawingShow = false
+ this.imageShow = false
+ this.productionShow = false
+ // const item = '83040700101'
+ const item = this.formData.billNo;
+ console.log(this.formData.billNo );
+ console.log('daa001:', item);
+ console.log('ItemNo:', this.formData.itemNo);
+
+ const url = this.$store.state.serverInfo.serverAPI + "/LLJ/getWomdab";
+ // 鎴栬�呭鏋滆矾寰勪笉鍚岋紝璇蜂娇鐢ㄦ纭殑绔偣
+ // const url = "http://192.168.0.100:10054/api/getWomdab"
+
+ let _this = this;
+
+ uni.request({
+ url: url,
+ method: 'POST',
+ header: {
+ 'Content-Type': 'application/json'
+ },
+ data: {
+ daa001: item, // 鏍规嵁DTO灞炴�у悕浼犻��
+ ItemNo: this.formData.itemNo // 娉ㄦ剰澶у皬鍐欏尮閰�
+ },
+ success: (response) => {
+ console.log(response);
+ console.log("-------------------------------------");
+ // 鏍规嵁鍚庣杩斿洖鐨勬暟鎹粨鏋勮繘琛岃皟鏁�
+ if (response.data.status === 1) {
+ // 鐘舵�佷负1琛ㄧず娌℃湁鏁版嵁
+ _this.drawing = [];
+
+ } else if (response.data.status === 0) {
+ // 鐘舵�佷负0琛ㄧず鎴愬姛
+ if (response.data.data && response.data.data.tbBillList) {
+ _this.drawing = response.data.data.tbBillList;
+
+ // 閬嶅巻鏁版嵁锛屽垽鏂枃浠跺悗缂�骞舵坊鍔犲瓧娈�
+ _this.drawing.forEach((file) => {
+ // 鑾峰彇鏂囦欢鍚嶇殑鍚庣紑
+ const fileExtension = file.fName ? file.fName.split('.').pop().toLowerCase() : '';
+
+ // 瀹氫箟鏀寔鐨勬枃浠剁被鍨�
+ const supportedExtensions = ['jpg', 'pdf', 'xlsx', 'doc', 'docx', 'xls'];
+
+ // 鍒ゆ柇鏄惁鏀寔璇ユ枃浠剁被鍨�
+ file.isSupported = supportedExtensions.includes(fileExtension);
+ });
+ } else {
+ _this.drawing = [];
+ }
+ } else {
+ // 鍏朵粬鐘舵�佺爜澶勭悊
+ _this.drawing = [];
+ uni.showToast({
+ title: response.data.message || '璇锋眰澶辫触',
+ icon: 'none'
+ });
+ }
+ },
+ fail: (error) => {
+ uni.showToast({
+ title: '璇锋眰鍥剧焊閾炬帴澶辫触',
+ icon: 'none'
+ });
+ console.error('璇锋眰澶辫触:', error);
+ }
+ });
+ },
+ itemCancel() {
+ this.itemShow=false
+ },
+
+ fetchDrawingNumber(itemNo) {
+ // const item = '83040700101'
+ const item = itemNo;
+ console.log(itemNo)
+ // console.log(item)
+ const url = this.$store.state.serverInfo.serverAPI +"/PLM/RetrieveDrawings?ItemNo=" + item
+
+ // const item = '5.06.04.4002';
+ // const url = "http://192.168.0.100:10054/api/PLM/RetrieveDrawings?ItemNo=" + item
+
+ let _this = this;
+
+ uni.request({
+ url: url,
+ method: 'POST',
+ success: (response) => {
+ console.log(response)
+ if (response.data.data == '杩斿洖缁撴灉涓虹┖') {
+ _this.drawing = []
+ } else {
+ _this.drawing = response.data.data
+ // 閬嶅巻鏁版嵁锛屽垽鏂枃浠跺悗缂�骞舵坊鍔犲瓧娈�
+ _this.drawing.forEach((file) => {
+ // 鑾峰彇鏂囦欢鍚嶇殑鍚庣紑
+ const fileExtension = file.fName.split('.').pop()
+ .toLowerCase();
+
+ // 瀹氫箟鏀寔鐨勬枃浠剁被鍨�
+ const supportedExtensions = ['jpg', 'pdf', 'xlsx', 'doc',
+ 'docx',
+ 'xls'
+ ];
+
+ // 鍒ゆ柇鏄惁鏀寔璇ユ枃浠剁被鍨�
+ file.isSupported = supportedExtensions.includes(fileExtension);
+ });
+ }
+ },
+ fail: (error) => {
+ uni.showToast({
+ title: '璇锋眰鍥剧焊閾炬帴澶辫触',
+ icon: 'none'
+ });
+ }
+ });
+ this.drawingShow = true
+ },
+
+ getBom(){
+ // const item = '83040700101'
+ const item = this.formData.billNo;
+ console.log(this.formData.billNo );
+ console.log('daa001:', item);
+ console.log('ItemNo:', this.formData.itemNo);
+
+ const url = this.$store.state.serverInfo.serverAPI + "/LLJ/getWomdab";
+ // 鎴栬�呭鏋滆矾寰勪笉鍚岋紝璇蜂娇鐢ㄦ纭殑绔偣
+ // const url = "http://192.168.0.100:10054/api/getWomdab"
+
+ let _this = this;
+
+ uni.request({
+ url: url,
+ method: 'POST',
+ header: {
+ 'Content-Type': 'application/json'
+ },
+ data: {
+ daa001: item, // 鏍规嵁DTO灞炴�у悕浼犻��
+ ItemNo: this.formData.itemNo // 娉ㄦ剰澶у皬鍐欏尮閰�
+ },
+ success: (response) => {
+ console.log(response);
+ console.log("-------------------------------------");
+ // 鏍规嵁鍚庣杩斿洖鐨勬暟鎹粨鏋勮繘琛岃皟鏁�
+ if (response.data.status === 1) {
+ // 鐘舵�佷负1琛ㄧず娌℃湁鏁版嵁
+ _this.drawing = [];
+ uni.showToast({
+ title: response.data.message || '璇ユ楠屽崟鏈笂浼犻檮浠朵俊鎭�',
+ icon: 'none'
+ });
+ } else if (response.data.status === 0) {
+ // 鐘舵�佷负0琛ㄧず鎴愬姛
+ if (response.data.data && response.data.data.tbBillList) {
+ _this.drawing = response.data.data.tbBillList;
+
+ // 閬嶅巻鏁版嵁锛屽垽鏂枃浠跺悗缂�骞舵坊鍔犲瓧娈�
+ _this.drawing.forEach((file) => {
+ // 鑾峰彇鏂囦欢鍚嶇殑鍚庣紑
+ const fileExtension = file.fName ? file.fName.split('.').pop().toLowerCase() : '';
+
+ // 瀹氫箟鏀寔鐨勬枃浠剁被鍨�
+ const supportedExtensions = ['jpg', 'pdf', 'xlsx', 'doc', 'docx', 'xls'];
+
+ // 鍒ゆ柇鏄惁鏀寔璇ユ枃浠剁被鍨�
+ file.isSupported = supportedExtensions.includes(fileExtension);
+ });
+ } else {
+ _this.drawing = [];
+ }
+ } else {
+ // 鍏朵粬鐘舵�佺爜澶勭悊
+ _this.drawing = [];
+ uni.showToast({
+ title: response.data.message || '璇锋眰澶辫触',
+ icon: 'none'
+ });
+ }
+ },
+ fail: (error) => {
+ uni.showToast({
+ title: '璇锋眰鍥剧焊閾炬帴澶辫触',
+ icon: 'none'
+ });
+ console.error('璇锋眰澶辫触:', error);
+ }
+ });
+ this.itemShow = true
+ },
+
+ //鍥剧焊鐩稿叧鏂囨。
+ openDrawings(item) {
+ console.log("jkjoi", item)
+ if (item.fRelevantObject.length > 2) {
+ // 鐢熸垚璇锋眰URL锛堢畝鍖栫紪鐮侀�昏緫锛�
+ const encodedName = encodeURIComponent(item.fName);
+ const url = this.$store.state.serverInfo.serverAPI+`/PLM/OpenDrawingsGet?fileId=${item.fRelevantObject}&fName=${encodedName}`;
+ console.log('璇锋眰URL:', url);
+
+ const now = new Date();
+ const timestamp = [
+ now.getFullYear(),
+ String(now.getMonth() + 1).padStart(2, '0'),
+ String(now.getDate()).padStart(2, '0'),
+ String(now.getHours()).padStart(2, '0'),
+ String(now.getMinutes()).padStart(2, '0'),
+ String(now.getSeconds()).padStart(2, '0')
+ ].join('');
+
+ // 鐢熸垚鏂版枃浠跺悕锛堝熀纭�鍚峗鏃堕棿鎴�.鍚庣紑锛�
+ this.fileName = `${item.fName}_${timestamp}.pdf`;
+ console.log('鏂版枃浠跺悕:', this.fileName);
+
+ uni.downloadFile({
+ url: url,
+ success: (res) => {
+ console.log(res);
+ let fileName = this.fileName;
+ let fileExt = fileName.split('.').pop();
+ // let newFilePath = "_doc/uniapp_temp_1742877118745/download" + "/" + fileName;
+ // console.log('newFilePath', newFilePath)
+ if (fileExt === 'xls' || fileExt === 'xlsx' || fileExt === 'pdf'|| fileExt === 'jpg'|| fileExt === 'png') {
+ plus.io.resolveLocalFileSystemURL(res.tempFilePath, (entry) => {
+ // 鑾峰彇鏂囦欢鎵�鍦ㄧ殑鐩綍
+ entry.getParent((parentEntry) => {
+ let newFileName = this.fileName; // 鏂扮殑鏂囦欢鍚�
+
+ // 绉诲姩骞堕噸鍛藉悕鏂囦欢
+ entry.moveTo(
+ parentEntry,
+ newFileName,
+ (newEntry) => {
+ console.log('閲嶅懡鍚嶆垚鍔�:', newEntry.fullPath);
+
+ // 鎵撳紑 Excel 鏂囦欢
+ plus.runtime.openFile(newEntry.fullPath, {}, (e) => {
+ console.error('鏃犳硶鎵撳紑 Excel 鏂囦欢:', e);
+ });
+
+ // let pages = getCurrentPages();
+ // let beforePage = pages[pages.length - 2];
+ // uni.navigateBack({
+ // delta: 1, //杩斿洖鐨勯〉闈㈡暟锛屽鏋滀负1琛ㄧず杩斿洖涓婁竴椤�
+ // success: (event) => {
+ // beforePage.$vm.reload()
+ // }
+ // });
+
+ },
+ (err) => {
+ console.error('閲嶅懡鍚嶅け璐�:', err);
+ }
+ );
+ }, (err) => {
+ console.error('鑾峰彇鐖剁洰褰曞け璐�:', err);
+ });
+ }, (err) => {
+ console.error('鑾峰彇鏂囦欢澶辫触:', err);
+ });
+ } else {
+ console.error('鏂囦欢鏍煎紡涓嶅尮閰�:', fileExt);
+ uni.showToast({
+ title: '鏂囦欢鏍煎紡涓嶆敮鎸�',
+ icon: 'none'
+ });
+ }
+ }
+ })
+ uni.request({
+ url: url,
+ method: 'POST',
+ responseType: 'arraybuffer',
+ success: (response) => {
+ console.log(response.data)
+ if (!response) {
+ uni.showToast({
+ title: "鍗忚棰勮澶辫触",
+ duration: 2000
+ });
+ }
+
+ },
+ fail: (error) => {
+ console.log(error)
+ uni.showToast({
+ title: '璇锋眰棰勮閾炬帴澶辫触',
+ icon: 'none'
+ });
+ }
+ });
+ }
+ else
+ {
+ uni.showToast({
+ title: '璇锋眰棰勮閾炬帴澶辫触',
+ icon: 'none'
+ });
+ }
+ },
previewOfficeFile(url, fileName) {
this.previewTitle = fileName;
--
Gitblit v1.9.3