From 262919ad055f1b5bca47171badf090ca5f5fccba Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 16 十月 2023 09:32:01 +0800
Subject: [PATCH] 	modified:   src/api/plan/customerorder.js 	modified:   src/views/plan/customerorder/customerorder-form.vue 	modified:   vue.config.js

---
 vue.config.js                                       |    2 
 src/api/plan/customerorder.js                       |    8 ++++
 src/views/plan/customerorder/customerorder-form.vue |   51 +++++++++++++++++--------
 3 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/src/api/plan/customerorder.js b/src/api/plan/customerorder.js
index 112e721..9a05ac4 100644
--- a/src/api/plan/customerorder.js
+++ b/src/api/plan/customerorder.js
@@ -51,6 +51,14 @@
   })
 }
 
+export function updateCustomerOrderById(obj) {
+  return request({
+    url: '/mes/plan/customerOrder/updateById',
+    method: 'put',
+    data: obj
+  })
+}
+
 // 鍒涘缓涓荤敓浜ц鍒掗渶姹�
 export function createMpsRequirements(obj) {
   return request({
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index bbe1d58..f1bb5ec 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -72,7 +72,13 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="瀹㈡埛璁㈠崟鐘舵��" prop="returnStatus">
-                <el-select
+                <el-input
+                v-model="dataForm.returnStatus"
+                  placeholder=""
+                  filterable
+                  style="width: 100%"
+                  disabled></el-input>
+                <!-- <el-select
                   v-model="dataForm.returnStatus"
                   placeholder=""
                   filterable
@@ -86,7 +92,7 @@
                     :value="item.value"
                     :disabled="!ediSource"
                   />
-                </el-select>
+                </el-select> -->
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -721,6 +727,7 @@
   getCustomerOrder,
   addCustomerOrder,
   putCustomerOrder,
+  updateCustomerOrderById,
   download,
   getOtcCustomerOrderFileList,
   otcDownload,
@@ -775,21 +782,39 @@
       showSynchronize: false,
       selectOrderParam: null,
       selectOrderObj: {},
+      aaaaa:{},
       dataForm: {
         id: 0,
         sourceId: '',
         contractNo: '',
-        customerOrderNo: '',
-        returnStatus: '',
-        deliveryDate: '',
         customerNo: '',
         customerName: '',
-        coState: '',
-        coLineNo: '',
+        returnStatus: '',
+        deliveryDate: '',
+        salesMan: '',
+        salerWorkCode: '',
+        manufactureAttr: '',
+        buyQtyDue: 0,
+        productName: '',
+        productType: '',
         partNo: '',
+        docNumber: '',
+        shippingAddress: '',
+        remark: '',
+        otcUnit: '',
+        coState: '',
+        customerPartSpec: '',
+        entityName: '',
+        factoryPlaceOrderDate: '',
+        isCp: '',
+        originalContractStatus: '',
+        placeOrderDate: '',
+        province: '',
+
+        customerOrderNo: '',
+        coLineNo: '',
         customerPartName: '',
         otcQuantity: '',
-        buyQtyDue: '',
         wantedDeliveryDate: '',
         plannedDeliveryDate: '',
         customerPoNo: '',
@@ -805,11 +830,7 @@
         ifsSalesUnit: null,
         ifsConvFactor: null,
         unit: null,
-        otcUnit: null,
         otcQuantity: null,
-        docNumber: null,
-        manufactureAttr: 'N',
-        customerPartSpec: null,
         division: null,
         printType: null,
         printingRequirements: null,
@@ -818,14 +839,10 @@
         qualityRequire: null,
         otherProductRequire: null,
         divisionSystem: null,
-        shippingAddress: null,
-        salesMan: null,
         lengthRequirement: null,
-        remark: null,
         otcPartSync: null,
         finalCustomerName: null,
         productGroup: null,
-        productType: null,
         centralizedMiningProperty: null,
         orderDescription: null,
         otcLineNo: null,
@@ -1114,7 +1131,7 @@
       this.$refs.dataForm.validate((valid) => {
         if (valid) {
           if (this.dataForm.id) {
-            putCustomerOrder(this.dataForm)
+            updateCustomerOrderById(this.dataForm)
               .then((data) => {
                 this.$message.success('淇敼鎴愬姛')
                 this.visible = false
diff --git a/vue.config.js b/vue.config.js
index 64b6d3b..992eca9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,7 +2,7 @@
  * 閰嶇疆鍙傝��:
  * https://cli.vuejs.org/zh/config/
  */
-const url = 'http://192.168.0.23:9999'
+const url = 'http://127.0.0.1:9999'
 const localUrl = 'http://localhost:8089'
 //const localUrl = 'http://10.88.15.95:8089'
 const CompressionWebpackPlugin = require('compression-webpack-plugin')

--
Gitblit v1.9.3