diff --git a/debug.log b/debug.log
index ed97f861..cf7df822 100644
--- a/debug.log
+++ b/debug.log
@@ -1 +1,2 @@
[0301/083149.303:ERROR:http_transport_win.cc(273)] WinHttpSendRequest: 操作成功完成。 (0x0)
+[0515/102246.688:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0)
diff --git a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
index 6356cd22..3f8f6066 100644
--- a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
+++ b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
@@ -71,3 +71,15 @@ export function searchtable2(num) {
}
})
}
+// 鍦ㄥ埗闆朵欢宸ヨ壓淇敼
+export function returnEdit(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_鍦ㄥ埗闆朵欢宸ヨ壓璋冩暣_淇敼宸ヨ壓',
+ param: '宸ヨ壓璁″垝娴佹按鍙=' + num
+ }
+ })
+}
diff --git a/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js b/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js
new file mode 100644
index 00000000..7a4fa413
--- /dev/null
+++ b/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js
@@ -0,0 +1,481 @@
+import request from '@/utils/request'
+
+// 鍏歌壓鏌ヨ<楂樼簿鍘熸湁鏁版嵁>
+export function searchProcess11(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_鍘熼浂浠跺伐鑹烘煡璇MESWORK',
+ param: '闆朵欢鍥惧彿=' + num
+ }
+ })
+}
+// 鍏歌壓鏌ヨ<楂樼簿鍘熸湁鏁版嵁>
+export function numChange(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_鍘熼浂浠跺伐鑹烘槑缁嗘煡璇MESWORK',
+ param: '鍏歌壓娴佹按鍙=' + num
+ }
+ })
+}
+// 淇濆瓨涓昏〃宸ヨ壓
+export function selectRequest(num0, num1, num2, num3, request0) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_淇敼鏁版嵁_鏍规嵁宸ュ簭娴佹按鍙峰拰宸ヨ壓璁″垝娴佹按鍙',
+ param: '宸ュ簭娴佹按鍙=' + num0 + '&宸ヨ壓璁″垝娴佹按鍙=' + num1 + '&宸ヨ壓缂栧彿=' + num2 + '&宸ヨ壓椤哄簭=' + num3 + '&宸ヨ壓瑕佹眰=' + request0
+ }
+ })
+}
+// 鍒濆鍖 宸ヨ壓鍛楢
+export function initCraftmen() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '浜轰簨妗f绠$悊_浜哄憳_閮ㄩ棬涓庝汉鍛榑鏌ヨ鏁版嵁_鏍规嵁閮ㄩ棬缂栧彿',
+ param: '鑰冩牳閮ㄩ棬缂栧彿=20'
+ }
+ })
+}
+// 鏌ヨ 鏈紪鍒 闆朵欢鍙
+export function getPartnames1(num1, num2) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ヨ壓璁″垝_缂栧埗宸ヨ壓_鎸変汉鍛樻煡',
+ param: '宸ヨ壓浜哄憳缂栧彿=' + num1 + '&闆朵欢鍥惧彿=' + num2
+ }
+ })
+}
+// 鍒濆鍖 宸茬紪鍒 闆朵欢鍙
+export function getPartnames2(num1, num2) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ヨ壓璁″垝_鏌ヨ宸插畬鎴愬伐鑹哄埗瀹氶浂浠',
+ param: '宸ヨ壓浜哄憳缂栧彿=' + num1 + '&闆朵欢鍥惧彿=' + num2
+ }
+ })
+}
+// 闆朵欢璇︾粏淇℃伅
+export function detailInfo(serialNum) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ヨ壓璁″垝_鏌ュ凡鎶曚骇闆朵欢淇℃伅',
+ param: '宸ヨ壓璁″垝娴佹按鍙=' + serialNum + '=int'
+ }
+ })
+}
+// 鍒濆鍖栨潗璐
+export function getMaterial(pageCurrent, pageSize) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_鏉愯川琛╛鏌ヨ鏁版嵁',
+ Pagination: pageCurrent + '&' + pageSize
+ }
+ })
+}
+// 鏍规嵁鏉愯川鍚嶇О鏌ユ潗璐
+export function searchMaterial(pageCurrent, pageSize, name) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_鏉愯川琛╛鏌ヨ鏁版嵁_鏍规嵁鏉愭枡鍚嶇О',
+ param: '鏉愭枡鍚嶇О=' + name,
+ Pagination: pageCurrent + '&' + pageSize
+ }
+ })
+}
+// 鍏稿瀷宸ヨ壓閫夋嫨闆朵欢鍒嗙被A
+export function typicalProcess() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_鍩虹琛╛鍏稿瀷宸ヨ壓鍚嶇О_鍒嗙被_鏌ヨ鏁版嵁'
+ }
+ })
+}
+// 鍏稿瀷宸ヨ壓閫夋嫨闆朵欢鍚嶇О銆佸伐鑹哄彿銆佸娉
+export function FcK(serialNum) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_鍩虹琛╛鍏稿瀷宸ヨ壓鍚嶇О_鏌ヨ鏁版嵁_鏌ュ吀鍨嬪伐鑹哄悕绉',
+ param: '鍏稿瀷宸ヨ壓鍚嶇О鍒嗙被娴佹按鍙=' + serialNum + '=int'
+ }
+ })
+}
+// 鍏稿瀷宸ヨ壓鏌ヨ
+export function searchProcess(check1, a, check2, b, check3, c) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_鍩虹琛╛鍏稿瀷宸ヨ壓鍚嶇О_鏌ヨ鏁版嵁_缁煎悎鏌ヨ',
+ param: '鍏稿瀷宸ヨ壓鍚嶇О鍒嗙被娴佹按鍙穇check=' + check1 + '=bit&鍏稿瀷宸ヨ壓鍚嶇О鍒嗙被娴佹按鍙=' + a + '=int&鍏稿瀷宸ヨ壓娴佹按鍙穇check=' + check2 + '=bit&鍏稿瀷宸ヨ壓娴佹按鍙=' + b + '=int&鍏稿瀷宸ヨ壓娴佹按鍙1_check=' + check3 + '=bit&鍏稿瀷宸ヨ壓娴佹按鍙1=' + c + '=int'
+ }
+ })
+}
+// 鍒濆鍖栧伐鑹哄悕绉
+export function processNameClick() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_鍩虹琛╛宸ヨ壓鍒嗙被鍚嶇О_鏌ヨ鏁版嵁_闆朵欢宸ヨ壓鍒跺畾涓撶敤'
+ }
+ })
+}
+// 宸ヨ壓鍚嶇О鏌ヨ
+export function processNameSelect(val) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_鍩虹琛╛宸ヨ壓鍚嶇О_鏌ヨ鏁版嵁',
+ param: '宸ヨ壓鍒嗙被娴佹按鍙穇check=1=bit&宸ヨ壓鍒嗙被娴佹按鍙=' + val + '=int'
+ }
+ })
+}
+// 宸ヨ壓瑕佹眰鏌ヨ
+export function processRequestSelect(val) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊_鍩虹琛╛宸ヨ壓瑕佹眰_鏌ヨ鏁版嵁',
+ param: '宸ヨ壓缂栧彿=' + val + '=int'
+ }
+ })
+}
+// 鍒濆鍖栧叕宸瓵
+export function initTolerance() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_鍩虹琛╛鍏樊瀵圭収琛╛鏌ヨ鏁版嵁'
+ }
+ })
+}
+// 鍏樊鏌ヨ
+export function searchTolerance(val1, val2) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_鍩虹琛╛鍏樊瀵圭収琛╛鍏樊_鏌ヨ鏁版嵁',
+ param: '杈撳叆鏁板=' + val1 + '&鍙傛暟=' + val2
+ }
+ })
+}
+// 宸ヨ壓瀹氶浜哄憳鏌ヨ
+export function initPerson() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '浜轰簨妗f绠$悊_浜哄憳_閮ㄩ棬涓庝汉鍛榑鏌ヨ鏁版嵁_鏍规嵁閮ㄩ棬缂栧彿',
+ param: '鑰冩牳閮ㄩ棬缂栧彿=9'
+ }
+ })
+}
+// 瀹岃壓宸ヨ壓鏌ヨ
+export function searchWYgongyi(check1, tuhao, check2, bianhao, check3, start, end, check4, name) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ヨ壓璁″垝_鏌ヨ鏁版嵁_鏍规嵁闆朵欢鍥惧彿鏌ヨ宸叉姇浜х殑宸ヨ壓璁″垝娴佹按鍙',
+ param: '闆朵欢鍥惧彿_check=' + check1 + '&闆朵欢鍥惧彿=' + tuhao + '&宸ヨ壓鍛樼紪鍙穇check=' + check2 + '&宸ヨ壓鍛樼紪鍙=' + bianhao + '&宸ヨ壓鏃堕棿_check=' + check3 + '&宸ヨ壓寮濮嬫椂闂=' + start + '=datetime&宸ヨ壓缁撴潫鏃堕棿=' + end + '=datetime&闆朵欢鍚嶇О_check=' + check4 + '&闆朵欢鍚嶇О=' + name
+ }
+ })
+}
+// 瀹岃壓宸ヨ壓瑕佹眰鏌ヨ
+export function gongyiYQ(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ヨ壓璁″垝_鏌ヨ鏁版嵁',
+ param: '宸ヨ壓璁″垝娴佹按鍙=' + num
+ }
+ })
+}
+// 瀹岃壓宸ヨ壓鎷疯礉
+export function gongyiCopy(num1, num2) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_宸ヨ壓鎷疯礉_宸ヨ壓璁″垝娴佹按鍙',
+ param: '宸ヨ壓璁″垝娴佹按鍙穇瀹屾垚宸ヨ壓=' + num1 + '=int&宸ヨ壓璁″垝娴佹按鍙穇琚嫹宸ヨ壓=' + num2 + '=int'
+ }
+ })
+}
+// 涓荤晫闈㈤夋嫨闆朵欢鍙锋煡涓昏〃
+export function mainTable(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_鏌ヨ宸ュ簭淇℃伅',
+ param: '宸ヨ壓璁″垝娴佹按鍙=' + num + '=int'
+ }
+ })
+}
+// 涓荤晫闈富琛ㄩ毦搴︾瓑绾т慨鏀
+export function hardEdit(num, hard) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_淇敼鏁版嵁_宸ヨ壓闅惧害绛夌骇',
+ param: '宸ュ簭娴佹按鍙=' + num + '=int&宸ヨ壓闅惧害绛夌骇=' + hard
+ }
+ })
+}
+// 涓荤晫闈富琛ㄥ伐鑹鸿姹備慨鏀
+export function requestEdit(num, request0) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_淇敼鏁版嵁_宸ヨ壓瑕佹眰_鏍规嵁宸ュ簭娴佹按鍙',
+ param: '宸ュ簭娴佹按鍙=' + num + '=int&宸ヨ壓瑕佹眰=' + request0
+ }
+ })
+}
+// 涓荤晫闈富琛ㄦ彃鍏ュ姛鑳
+export function insertOne(num0, num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_淇敼鏁版嵁_宸ヨ壓璁″垝娴佹按鍙峰拰宸ュ簭娴佹按鍙',
+ param: '宸ヨ壓璁″垝娴佹按鍙=' + num0 + '=int&宸ュ簭娴佹按鍙=' + num1 + '=int'
+ }
+ })
+}
+// 涓荤晫闈富琛ㄥ垹闄ゅ姛鑳
+export function deleteOne(num0, num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_鍒犻櫎鏁版嵁_宸ュ簭娴佹按鍙',
+ param: '宸ヨ壓璁″垝娴佹按鍙=' + num0 + '=int&宸ュ簭娴佹按鍙=' + num1 + '=int'
+ }
+ })
+}
+// 涓荤晫闈富琛ㄤ笂绉诲姛鑳
+export function upOne(num0, num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_淇敼鏁版嵁_涓婄Щ宸ュ簭',
+ param: '宸ヨ壓璁″垝娴佹按鍙=' + num0 + '=int&宸ュ簭娴佹按鍙=' + num1 + '=int'
+ }
+ })
+}
+// 涓荤晫闈富琛ㄤ笅绉诲姛鑳
+export function downOne(num0, num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_淇敼鏁版嵁_涓嬬Щ宸ュ簭',
+ param: '宸ヨ壓璁″垝娴佹按鍙=' + num0 + '=int&宸ュ簭娴佹按鍙=' + num1 + '=int'
+ }
+ })
+}
+// 淇濆瓨鍙樻洿鏉愯川
+export function saveMaterial(num0, num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ヨ壓璁″垝_淇敼闆朵欢鏉愭枡',
+ param: '宸ヨ壓璁″垝娴佹按鍙=' + num0 + '&鏉愭枡娴佹按鍙=' + num1
+ }
+ })
+}
+// 鏍稿噯淇濆瓨
+export function saveApprove(num0, num1, request0, spec, num2, outhelp, num3, num4, weight, area, num5, level) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_澧炲姞鏁版嵁_鍚屾椂淇敼宸ヨ壓璁″垝',
+ param: '宸ヨ壓璁″垝娴佹按鍙=' + num0 + '&宸ヨ壓缂栧彿=' + num1 + '&宸ヨ壓瑕佹眰=' + request0 + '&鍘熸潗鏂欒鏍=' + spec + '&宸ュ簭椤哄簭=' + num2 + '&宸ュ簭闂存槸鍚﹀鍗=' + outhelp + '&宸ュ簭娴佹按鍙=' + num3 + '&鏉愭枡娴佹按鍙=' + num4 + '&閲嶉噺=' + weight + '&闈㈢Н=' + area + '&宸ヨ壓浜哄憳缂栧彿=' + num5 + '&宸ヨ壓闅惧害绛夌骇=' + level
+ }
+ })
+}
+
+// 绮樿创
+export function pasteTable(oldNum, newNum) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ヨ壓璁″垝_鎷疯礉闆朵欢宸ヨ壓',
+ param: '宸ヨ壓璁″垝娴佹按鍙锋棫=' + oldNum + '&宸ヨ壓璁″垝娴佹按鍙锋柊=' + newNum
+ }
+ })
+}
+// 鍒犻櫎
+export function deleteTable(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_鍒犻櫎闆朵欢宸ヨ壓',
+ param: '宸ヨ壓璁″垝娴佹按鍙=' + num
+ }
+ })
+}
+// 鍦ㄥ埗闆朵欢宸ヨ壓淇敼
+export function returnEdit(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_鍦ㄥ埗闆朵欢宸ヨ壓璋冩暣_淇敼宸ヨ壓',
+ param: '宸ヨ壓璁″垝娴佹按鍙=' + num
+ }
+ })
+}
+// 鏌ヨ宸ヨ壓璁板綍
+export function searchRecord(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_鍦ㄥ埗闆朵欢宸ヨ壓璋冩暣_鏌ヨ宸ヨ壓',
+ param: '宸ヨ壓璁″垝娴佹按鍙=' + num
+ }
+ })
+}
+// 閲嶉噺鎷疯礉
+export function WeightCopy(num, num2) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_閲嶉噺鎷疯礉_宸ヨ壓璁″垝娴佹按鍙',
+ param: '宸ヨ壓璁″垝娴佹按鍙=' + num + '&閲嶉噺淇℃伅=' + num2
+ }
+ })
+}
+// 淇濆瓨鍙樻洿鏉愯川
+export function saveWeight(num0, num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ヨ壓璁″垝_淇敼闆朵欢閲嶉噺',
+ param: '宸ヨ壓璁″垝娴佹按鍙=' + num0 + '&閲嶉噺=' + num1
+ }
+ })
+}
+// 鍗曚欢宸ユ椂鏀瑰彉
+export function singleChange(val1, val2) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_鍗曚欢鍑嗙粨瀹氶_淇敼鏁版嵁',
+ param: '宸ュ簭娴佹按鍙=' + val1 + '&鍗曚欢瀹氶宸ユ椂=' + val2
+ }
+ })
+}
+// 鍑嗙粨宸ユ椂鏀瑰彉
+export function readyChange(val1, val2) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_鍗曚欢鍑嗙粨瀹氶_淇敼鏁版嵁',
+ param: '宸ュ簭娴佹按鍙=' + val1 + '&鍑嗙粨瀹氶宸ユ椂=' + val2
+ }
+ })
+}
+// 鏈紪鍒跺畾棰濅繚瀛
+export function TableAddLi1(a, b) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_瀹氶浠诲姟鍒嗛厤_淇濆瓨鏁版嵁',
+ param: '宸ヨ壓璁″垝娴佹按鍙=' + a + '=string&浜哄憳缂栧彿=' + b + '=string'
+ }
+ })
+}
+// 宸茬紪鍒跺畾棰濅繚瀛
+export function TableAddLi(a, b, c, num0, num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '杞﹂棿鐢熶骇绠$悊宸ヨ壓_闆朵欢宸ュ簭_澧炲姞鏁版嵁_淇敼鏁版嵁',
+ param: '鍗曚欢瀹氶宸ユ椂=' + a + '=string&鍑嗙粨瀹氶宸ユ椂=' + b + '=string&闆朵欢鍥惧彿=' + c + '=string&宸ュ簭娴佹按鍙=' + num0 + '=int&宸ヨ壓璁″垝娴佹按鍙=' + num1 + '=int'
+ }
+ })
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 0a45cef9..4499cb7a 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -16,13 +16,7 @@ export const uploadInvoiceScan = `http://192.168.1.231:8411/submit/uploadInvoice
export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoiceScan1.ashx` // invoice(workshop)
export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
const service = axios.create({
- // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
- // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
- // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
- // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
- // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
- // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 璇锋眰瓒呮椂鏃堕棿
})
diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index a033f54f..20f76a6e 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -32,15 +32,13 @@
宸ヨ壓鍛橈細
-
+
-
-
鏌ヨ
@@ -81,6 +79,9 @@
+
+ 鍦ㄥ埗闆朵欢宸ヨ壓璋冩暣
+
| 姹熻嫃楂樼簿 |
@@ -151,7 +152,8 @@
+
+
+
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/exportExcel.js b/src/views/PurchasingCenter/CreateInquirySheet/exportExcel.js
index ce61818e..c5075de7 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/exportExcel.js
+++ b/src/views/PurchasingCenter/CreateInquirySheet/exportExcel.js
@@ -11,6 +11,11 @@ const tableToExcel = (function() {
return function(table, filename, sheetname) {
if (!table.nodeType) table = document.getElementById(table)
const ctx = { worksheet: sheetname || 'Worksheet', table: table.innerHTML }
+ const blob = new Blob([format(template, ctx)])
+ if ('msSaveOrOpenBlob' in navigator) {
+ window.navigator.msSaveOrOpenBlob(blob, filename + '.xls')
+ return
+ }
const aTag = document.createElement('a')
aTag.href = uri + base64(format(template, ctx))
aTag.download = filename