From 26b89365250025e2a05e274ac911dea38ae6b7ba Mon Sep 17 00:00:00 2001
From: NH-LHG <lhg0612@126.com>
Date: Fri, 16 Jun 2023 13:34:08 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90init=E3=80=91=20=E5=88=9B=E5=BB=BAerp?=
 =?UTF-8?q?=20=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/erp/modules/OrderForm.vue | 72 +++++------------------------
 1 file changed, 11 insertions(+), 61 deletions(-)

diff --git a/src/views/erp/modules/OrderForm.vue b/src/views/erp/modules/OrderForm.vue
index 0aba471..ffef983 100644
--- a/src/views/erp/modules/OrderForm.vue
+++ b/src/views/erp/modules/OrderForm.vue
@@ -29,31 +29,6 @@
               <a-input v-model="model.addr" placeholder="请输入地址" ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="物控员id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialId">
-              <a-input v-model="model.materialId" placeholder="请输入物控员id" ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="物控员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialClerk">
-              <a-input v-model="model.materialClerk" placeholder="请输入物控员" ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="物控员备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialRemark">
-              <a-input v-model="model.materialRemark" placeholder="请输入物控员备注" ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="物控审核时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialTime">
-              <j-date placeholder="请选择物控审核时间" v-model="model.materialTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="审核人id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="financeId">
-              <a-input v-model="model.financeId" placeholder="请输入审核人id" ></a-input>
-            </a-form-model-item>
-          </a-col>
           <a-col :span="24" >
             <a-form-model-item label="审核人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="financeReview">
               <a-input v-model="model.financeReview" placeholder="请输入审核人" ></a-input>
@@ -70,43 +45,18 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24" >
-            <a-form-model-item label="付款回执url" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="financeUrl">
-              <j-image-upload isMultiple  v-model="model.financeUrl" ></j-image-upload>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="仓管员id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dispacherId">
-              <a-input v-model="model.dispacherId" placeholder="请输入仓管员id" ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="仓管员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dispacher">
-              <a-input v-model="model.dispacher" placeholder="请输入仓管员" ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="提货时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dispacherTime">
-              <j-date placeholder="请选择提货时间" v-model="model.dispacherTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="出库回执url" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dispacherUrl">
-              <j-image-upload isMultiple  v-model="model.dispacherUrl" ></j-image-upload>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="物流单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="logisticsId">
-              <a-input v-model="model.logisticsId" placeholder="请输入物流单号" ></a-input>
+            <a-form-model-item label="派单人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dispacher">
+              <a-input v-model="model.dispacher" placeholder="请输入派单人" ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24" >
-            <a-form-model-item label="提货备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dispacherRemark">
-              <a-input v-model="model.dispacherRemark" placeholder="请输入提货备注" ></a-input>
+            <a-form-model-item label="派发时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dispacherTime">
+              <j-date placeholder="请选择派发时间" v-model="model.dispacherTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24" >
-            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
-              <a-input-number v-model="model.state" placeholder="请输入状态" style="width: 100%" />
+            <a-form-model-item label="状态,0:待付款 默认，1：待发货，2：已发货，3：完结，4：退换货" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <j-dict-select-tag type="list" v-model="model.state" dictCode="orderState" placeholder="请选择状态,0:待付款 默认，1：待发货，2：已发货，3：完结，4：退换货" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24" >
@@ -147,7 +97,7 @@
     import JFormContainer from '@/components/jeecg/JFormContainer'
 
     export default {
-        name: 'OrdersForm',
+        name: 'OrderForm',
         mixins: [JVxeTableModelMixin],
         components: {
             JFormContainer,
@@ -225,11 +175,11 @@
                     ]
                 },
                 url: {
-                    add: "/erp/orders/add",
-                    edit: "/erp/orders/edit",
-                    queryById: "/erp/orders/queryById",
+                    add: "/erp/order/add",
+                    edit: "/erp/order/edit",
+                    queryById: "/erp/order/queryById",
                     orderDetail: {
-                        list: '/erp/orders/queryOrderDetailByMainId'
+                        list: '/erp/order/queryOrderDetailByMainId'
                     },
                 }
             }