From 54830604377cd13341b9236b968a9ab283dcf26e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com>
Date: Mon, 30 Jan 2023 15:06:10 +0800
Subject: [PATCH] 2023-01-30

---
 .../src/views/system/Depart3List.vue                 | 12 +++++++-----
 ant-design-vue-jeecg/src/views/system/DepartList.vue |  2 +-
 .../src/views/system/modules/DepartModal.vue         |  4 ++--
 .../views/zyWorkorderManagement/ZyWorkOrderList.vue  |  4 ++--
 .../jeecg/modules/workorder/entity/WorkOrder.java    |  1 +
 .../workorder/service/impl/WorkOrderServiceImpl.java |  5 ++++-
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/system/Depart3List.vue b/ant-design-vue-jeecg/src/views/system/Depart3List.vue
index 5848e24d..a3144667 100644
--- a/ant-design-vue-jeecg/src/views/system/Depart3List.vue
+++ b/ant-design-vue-jeecg/src/views/system/Depart3List.vue
@@ -104,7 +104,7 @@
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
                 label="缩写">
-                <a-input placeholder="请输入手机号" v-decorator="['departNameAbbr', validatorRules.departNameAbbr  ]"/>
+                <a-input placeholder="请输入缩写" v-decorator="['departNameAbbr', validatorRules.departNameAbbr  ]"/>
               </a-form-item>
 
 
@@ -114,7 +114,7 @@
                 label="部门编码">
                 <a-input disabled placeholder="请输入部门编码" v-decorator="['orgCode', validatorRules.orgCode ]"/>
               </a-form-item>
-              <template v-if="orgTypeDisabled">
+              <!--<template v-if="orgTypeDisabled">-->
               <a-form-item
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
@@ -155,7 +155,7 @@
                   <!--</a-radio-group>-->
                 <!--</template>-->
               </a-form-item>
-              </template>
+              <!--</template>-->
 
 
               <template v-if="orgTypeDisabled">
@@ -468,7 +468,7 @@
         console.log('selected', selectedKeys, e)
         this.hiding = false
         let record = e.node.dataRef
-        console.log('onSelect-record', record)
+        console.log('onSelect-record-3', record)
         this.currSelected = Object.assign({}, record)
         this.model = this.currSelected
         this.selectedKeys = [record.key]
@@ -491,8 +491,10 @@
         }
 
         this.$nextTick(() => {
+          //this.form.getFieldDecorator('departNameAbbr', {initialValue: ''})
+          // this.form.getFieldDecorator('fax', {initialValue: ''})
           // this.form.getFieldDecorator('fax', {initialValue: ''})
-          this.form.setFieldsValue(pick(record, 'departName','orgCategory', 'orgCode', 'departOrder', 'mobile', 'fax', 'address', 'memo'))
+          this.form.setFieldsValue(pick(record, 'departName','departNameEn','departNameAbbr','orgCategory', 'orgCode', 'departOrder', 'mobile', 'address', 'memo'))
         })
       },
       getCurrSelectedTitle() {
diff --git a/ant-design-vue-jeecg/src/views/system/DepartList.vue b/ant-design-vue-jeecg/src/views/system/DepartList.vue
index 1ae5de98..38f33200 100644
--- a/ant-design-vue-jeecg/src/views/system/DepartList.vue
+++ b/ant-design-vue-jeecg/src/views/system/DepartList.vue
@@ -474,7 +474,7 @@
         }
         this.$nextTick(() => {
           this.form.getFieldDecorator('fax', {initialValue: ''})
-          this.form.setFieldsValue(pick(record, 'departName','orgCategory', 'orgCode', 'departOrder', 'mobile', 'fax', 'address', 'memo'))
+          this.form.setFieldsValue(pick(record, 'departName','departNameEn','departNameAbbr','orgCategory', 'orgCode', 'departOrder', 'mobile', 'fax', 'address', 'memo'))
         })
       },
       getCurrSelectedTitle() {
diff --git a/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue b/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
index 79f4f0ff..924cef3c 100644
--- a/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
@@ -44,7 +44,7 @@
           <a-input placeholder="请输入手机号" v-decorator="['departNameAbbr', validatorRules.departNameAbbr  ]"/>
         </a-form-item>
 
-        <template v-if="seen">
+        <!--<template v-if="seen">-->
           <a-form-item
             :labelCol="labelCol"
             :wrapperCol="wrapperCol"
@@ -70,7 +70,7 @@
                 </a-radio>
               </a-radio-group>
           </a-form-item>
-        </template>
+        <!--</template>-->
 
         <!--<a-form-item-->
           <!--:labelCol="labelCol"-->
diff --git a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue
index da8c5137..e5cdf913 100644
--- a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue
+++ b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue
@@ -37,7 +37,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!--<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
-      <a-button type="primary" icon="download" @click="handleExportXls('工单订单完工')">导出</a-button>
+      <!--<a-button type="primary" icon="download" @click="handleExportXls('工单订单完工')">导出</a-button>-->
       <!--<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
         <!--<a-button type="primary" icon="import">导入</a-button>-->
       <!--</a-upload>-->
@@ -188,7 +188,7 @@
           {
             title:'企业',
             align:"center",
-            dataIndex: 'enterprisesId'
+            dataIndex: 'departName'
           },
           {
             title: '操作',
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrder.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrder.java
index 688d576e..46179645 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrder.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrder.java
@@ -93,6 +93,7 @@ public class WorkOrder implements Serializable {
     private Integer workOrderStatus;
 	/**企业*/
 	@Excel(name = "企业", width = 15)
+    @Dict(dictTable = "sys_depart",dicText = "depart_name", dicCode = "id")
     @ApiModelProperty(value = "企业")
     private String enterprisesId;
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java
index 2553db37..6d71b47c 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java
@@ -219,7 +219,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
                     return Result.error("未找到对客户量体数据！");
                 }
 
-
+                //商品数量对应产品
                 for(int i=0;i<goodNum;i++)
                 {
                     ZyProduct productModel=new  ZyProduct();
@@ -407,6 +407,9 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     public Result<?> cancellationWorkOrder(WorkOrder woModel) {
 
         //ZyProduct
+        //工单
+            //-产品
+                //-工序
 
         return null;
     }