Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

debug.log

@@ -0,0 +1 @@
+[0301/083149.303:ERROR:http_transport_win.cc(273)] WinHttpSendRequest: 操作成功完成。 (0x0)

src/api/Outsourcing/OutsourcingPaymentPlanManagement.js

@@ -68,7 +68,7 @@ export function getParts(Number, pageCurrent, pageSize) {
     data: {
       type: '1',
       name: '车间生产管理工艺_外协发票管理_查询数据',
-      param: '外协加工任务单流水号=' + Number + '=int',
+      param: '外协厂家流水号=' + Number + '=int',
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/utils/request.js

@@ -7,13 +7,13 @@ export const wsuri = `ws://192.168.1.231:61101//WebMoudule//websocket`
 export const name = `OP8888`
 
 // 创建axios实例
-export const readFile = `192.168.1.231:8411/webpage/file/` // invoice
+export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice
-export const readImg = `192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond
+export const readImg = `http://192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond
-export const upload = `192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement
+export const upload = `http://192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement
-export const upload2 = `192.168.1.231:8411/submit/upload2.ashx` // delivery
+export const upload2 = `http://192.168.1.231:8411/submit/upload2.ashx` // delivery
-export const upload3 = `192.168.1.231:8411/submit/upload3.ashx` // performancebond
+export const upload3 = `http://192.168.1.231:8411/submit/upload3.ashx` // performancebond
-export const uploadInvoiceScan = `192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice
+export const uploadInvoiceScan = `http://192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice
-export const download = `192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
+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`,

src/views/ManufacturingCenter/ProcessPlanning/index.vue

@@ -402,6 +402,7 @@
                 v-model="tuhaoValue"
                 placeholder="零件图号"
                 size="small"
+                filterable
                 style="width:150px"
                 @change="numChange1()">
                 <el-option

src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue

@@ -575,12 +575,16 @@ export default {
       this.zhongjianbianliang = row.外协加工任务单流水号
       this.fukuanshijian = row.实际付款时间
       getParts(row.外协加工任务单流水号, this.pageCurrent2, this.pageSize2).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
+        if (response.data.rows.length === 0) {
-          response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' '))
+          this.loading2 = false
-          response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' '))
+        } else {
+          for (let i = 0; i < response.data.rows.length; i++) {
+            response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' '))
+            response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' '))
+          }
+          this.tableData2 = response.data.rows
+          this.total2 = response.data.total
         }
-        this.tableData2 = response.data.rows
-        this.total2 = response.data.total
       }).then(() => {
         this.loading2 = false
       })