diff --git a/debug.log b/debug.log
index cf7df822..af455d92 100644
--- a/debug.log
+++ b/debug.log
@@ -1,2 +1,3 @@
[0301/083149.303:ERROR:http_transport_win.cc(273)] WinHttpSendRequest: 操作成功完成。 (0x0)
[0515/102246.688:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0)
+[0531/081503.881:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0)
diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/api/Assembly/QualityInspectionInformationInquiry.js
index 5d27c1d4..a19ab64c 100644
--- a/src/api/Assembly/QualityInspectionInformationInquiry.js
+++ b/src/api/Assembly/QualityInspectionInformationInquiry.js
@@ -11,27 +11,27 @@ export function initProject() {
}
})
}
-// PDM_鏈哄簥鍚嶇О_鍙戣揣鐘舵乢鏌ヨ鏁版嵁
-export function selecttable(check2, machineNumberValue) {
+// 缁勪欢鏌ヨ
+export function searchgroup(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
- name: 'PDM_鏈哄簥鍚嶇О_鍙戣揣鐘舵乢鏌ヨ鏁版嵁',
- param: '鏈哄簥娴佹按鍙穇check=' + check2 + '&鏈哄簥娴佹按鍙=' + machineNumberValue
+ name: 'PDM_缁勪欢鍚嶇О_鏌ヨ鏁版嵁',
+ param: '鏈哄簥娴佹按鍙=' + num
}
})
}
-// PDM_鏈哄簥鍚嶇О_鍙戣揣鐘舵乢缂栬緫鏁版嵁
-export function updatestate(machineNumberValue, state) {
+// 缁勪欢鏌ヨ
+export function selecttable(check1, value1, check2, value2, check3, value3) {
return request({
url: '',
method: 'post',
data: {
type: '1',
- name: 'PDM_鏈哄簥鍚嶇О_鍙戣揣鐘舵乢缂栬緫鏁版嵁',
- param: '鏈哄簥娴佹按鍙=' + machineNumberValue + '&鍙戣揣鐘舵=' + state
+ name: '璐ㄩ噺绠$悊_璐ㄩ噺鎯呭喌_鏌ヨ鏁版嵁',
+ param: '鏈哄簥娴佹按鍙穇check=' + check1 + '&鏈哄簥娴佹按鍙=' + value1 + '&缁勪欢娴佹按鍙穇check=' + check2 + '&缁勪欢娴佹按鍙=' + value2 + '&闆朵欢鍚嶇О_check=' + check3 + '&闆朵欢鍚嶇О=' + value3
}
})
}
diff --git a/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js b/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js
index 63742b3b..6867c148 100644
--- a/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js
+++ b/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js
@@ -1,6 +1,6 @@
import request from '@/utils/request'
-// 鏌ヨ闆朵欢锛堝寘鍚熺敤浠讹級
+// 鏌ヨ闆朵欢鏈紪鍒讹紙鍖呭惈鍊熺敤浠讹級
export function getPartnames3(num1, num2) {
return request({
url: '',
@@ -12,6 +12,18 @@ export function getPartnames3(num1, num2) {
}
})
}
+// 鏌ヨ闆朵欢宸茬紪鍒讹紙鍖呭惈鍊熺敤浠讹級
+export function getPartnames4(num1, num2) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ヨ壓璁″垝_鏌ヨ宸插畬鎴愬伐鑹哄埗瀹氶浂浠禵鎸変汉鍛樻満搴婄粍鍙锋垨鍥惧彿鏌',
+ param: '宸ヨ壓浜哄憳缂栧彿=' + num1 + '&鏈哄簥缁勫彿鎴栧浘鍙=' + num2
+ }
+ })
+}
// 鍏歌壓鏌ヨ<楂樼簿鍘熸湁鏁版嵁>
export function searchProcess11(num) {
return request({
@@ -491,3 +503,15 @@ export function TableAddLi(a, b, c, num0, num1) {
}
})
}
+// 淇敼澶囨敞
+export function modifyRemark(...params) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ヨ壓璁″垝_宸ヨ壓淇敼璁板綍_澧炲姞鏁版嵁',
+ param: `淇敼浜哄憳缂栧彿=${params[0]}&淇敼澶囨敞=${params[1]}&宸ヨ壓璁″垝娴佹按鍙=${params[2]}`
+ }
+ })
+}
diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue
index 75eda729..a661d266 100644
--- a/src/views/Assembly/AssemblyExecution/index.vue
+++ b/src/views/Assembly/AssemblyExecution/index.vue
@@ -3,7 +3,7 @@
鏈哄簥缂栧彿:
-
+
{{ item.name }}
- 缁勫彿:
-
-
-
- 鏌ヨ
+
+
+
+
+
+
+
+
+
鎬昏璋冭瘯
-
+
{{ scope.row.椤圭洰鍚嶇О }}
@@ -61,7 +61,7 @@
閮ㄨ
-
+
{{ scope.row.椤圭洰鍚嶇О }}
diff --git a/src/views/Assembly/DeliveryApplication/index.vue b/src/views/Assembly/DeliveryApplication/index.vue
index 957016d1..8ed12e58 100644
--- a/src/views/Assembly/DeliveryApplication/index.vue
+++ b/src/views/Assembly/DeliveryApplication/index.vue
@@ -13,7 +13,7 @@
{{ item.name }}
- 鏌ヨ
+
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index f1616531..93e95164 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -3,7 +3,7 @@
鏈哄簥缂栧彿:
-
+
{{ item.name }}
+ 缁勫彿:
+
+
+
+ 璐ㄦ绫诲瀷:
+
+
+
+ 闆朵欢:
+
鏌ヨ
@@ -23,7 +41,7 @@
{{ scope.row.椤圭洰鍚嶇О }}
-
+
{{ scope.row.鏈哄簥鍥惧彿 }}
@@ -33,21 +51,49 @@
{{ scope.row.鏈哄簥鍚嶇О }}
-
+
- {{ scope.row.鏈哄簥鏁伴噺 }}
+ {{ scope.row.缁勫彿 }}
-
+
- {{ scope.row.娉ㄦ剰浜嬮」 }}
+ {{ scope.row.闆朵欢鍥惧彿 }}
-
+
- 纭鍙戣揣
- 寰 瀹℃壒
- 宸插鎵
+ {{ scope.row.闆朵欢鍚嶇О }}
+
+
+
+
+ {{ scope.row.璐ㄦ绫诲瀷 }}
+
+
+
+
+ {{ scope.row.鏁伴噺 }}
+
+
+
+
+ {{ scope.row.涓嶅悎鏍兼暟閲 }}
+
+
+
+
+ {{ scope.row.涓嶅悎鏍煎師鍥 }}
+
+
+
+
+ {{ scope.row.澶勭悊缁撴灉 }}
+
+
+
+
+ {{ scope.row.澶囨敞 }}
@@ -56,7 +102,7 @@