From c5cb29a5f8556388f95207199b5c59553ff893f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com>
Date: Wed, 14 Dec 2022 16:23:29 +0800
Subject: [PATCH] 2022-12-14-01-bug

---
 .../src/views/maker/modules/QRCode.vue        |  2 +-
 .../src/views/system/Depart3List.vue          | 79 +++++++++----------
 .../src/views/system/modules/DepartModal.vue  | 43 +++++-----
 .../src/views/zyworkorder/modules/QRCode.vue  |  2 +-
 4 files changed, 61 insertions(+), 65 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/maker/modules/QRCode.vue b/ant-design-vue-jeecg/src/views/maker/modules/QRCode.vue
index dd6ff48d..9ca26091 100644
--- a/ant-design-vue-jeecg/src/views/maker/modules/QRCode.vue
+++ b/ant-design-vue-jeecg/src/views/maker/modules/QRCode.vue
@@ -29,7 +29,7 @@
 
   import { httpAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
-  import { Print } from 'vue-print-nb'
+  import { Print } from 'vue-print-nb-jeecg'
   export default {
     name: "MakerQRCode",
     components: {
diff --git a/ant-design-vue-jeecg/src/views/system/Depart3List.vue b/ant-design-vue-jeecg/src/views/system/Depart3List.vue
index e98db90a..de072563 100644
--- a/ant-design-vue-jeecg/src/views/system/Depart3List.vue
+++ b/ant-design-vue-jeecg/src/views/system/Depart3List.vue
@@ -7,11 +7,11 @@
         <a-row style="margin-left: 14px">
           <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
           <a-button @click="handleAdd(2)" type="primary">添加下级</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>
-          <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</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>-->
+          <!--<a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>-->
           <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
         </a-row>
         <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
@@ -28,7 +28,7 @@
               <a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">
                <span style="user-select: none">
             <a-tree
-              checkable
+
               multiple
               @select="onSelect"
               @check="onCheck"
@@ -78,9 +78,10 @@
               <a-form-item
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
-                label="机构名称">
+                label="部门名称">
                 <a-input placeholder="请输入机构/部门名称" v-decorator="['departName', validatorRules.departName ]"/>
               </a-form-item>
+              <template v-if="!orgCategoryDisabled">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门">
                 <a-tree-select
                   style="width:100%"
@@ -91,45 +92,43 @@
                   placeholder="无">
                 </a-tree-select>
               </a-form-item>
+              </template>
               <a-form-item
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
-                label="机构编码">
-                <a-input disabled placeholder="请输入机构编码" v-decorator="['orgCode', validatorRules.orgCode ]"/>
+                label="部门编码">
+                <a-input disabled placeholder="请输入部门编码" v-decorator="['orgCode', validatorRules.orgCode ]"/>
               </a-form-item>
               <a-form-item
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
-                label="机构类型">
+                label="部门类型">
                 <template v-if="orgCategoryDisabled">
-                  <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
+                  <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择部门类型">
                     <a-radio value="1">
-                      行政
+                      管理机构
                     </a-radio>
                     <a-radio value="2">
-                      教学
+                      生产企业
+                    </a-radio>
+                    <a-radio value="4">
+                      网店
                     </a-radio>
                     <a-radio value="5">
-                      公司
+                      门店
+                    </a-radio>
+                    <a-radio value="6">
+                      供应商
+                    </a-radio>
+                    <a-radio value="7">
+                      物流公司
                     </a-radio>
                   </a-radio-group>
                 </template>
                 <template v-else>
-                  <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
-                    <a-radio value="1">
-                      行政
-                    </a-radio>
-                    <a-radio value="2">
-                      教学
-                    </a-radio>
+                  <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择部门类型">
                     <a-radio value="3">
-                      班级
-                    </a-radio>
-                    <a-radio value="4">
-                      分组
-                    </a-radio>
-                    <a-radio value="5">
-                      公司
+                      子部门
                     </a-radio>
                   </a-radio-group>
                 </template>
@@ -170,9 +169,9 @@
             </a-empty>
           </a-card>
         </a-tab-pane>
-        <a-tab-pane tab="部门权限" key="2" forceRender>
-          <depart-auth-modal ref="departAuth"/>
-        </a-tab-pane>
+        <!--<a-tab-pane tab="部门权限" key="2" forceRender>-->
+          <!--<depart-auth-modal ref="departAuth"/>-->
+        <!--</a-tab-pane>-->
       </a-tabs>
 
     </a-col>
@@ -189,16 +188,16 @@
   // 表头
   const columns = [
     {
-      title: '机构名称',
+      title: '部门名称',
       dataIndex: 'departName'
     },
     {
-      title: '机构类型',
+      title: '部门类型',
       align: 'center',
       dataIndex: 'orgType'
     },
     {
-      title: '机构编码',
+      title: '部门编码',
       dataIndex: 'orgCode',
     },
     {
@@ -273,9 +272,9 @@
           edges: []
         },
         validatorRules: {
-          departName: {rules: [{required: true, message: '请输入机构/部门名称!'}]},
-          orgCode: {rules: [{required: true, message: '请输入机构编码!'}]},
-          orgCategory: {rules: [{required: true, message: '请输入机构类型!'}]},
+          departName: {rules: [{required: true, message: '请输入部门/部门名称!'}]},
+          orgCode: {rules: [{required: true, message: '请输入部门编码!'}]},
+          orgCategory: {rules: [{required: true, message: '请输入部门类型!'}]},
           mobile: {rules: [{validator: this.validateMobile}]}
         },
         url: {
@@ -447,10 +446,10 @@
       },
       // 触发onSelect事件时,为部门树右侧的form表单赋值
       setValuesToForm(record) {
-        if(record.orgCategory == '1'){
-          this.orgCategoryDisabled = true;
+        if(record.orgCategory == '3'){
+          this.orgCategoryDisabled =false ;
         }else{
-          this.orgCategoryDisabled = false;
+          this.orgCategoryDisabled =true;
         }
         this.$nextTick(() => {
           this.form.getFieldDecorator('fax', {initialValue: ''})
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 7a7d1b17..13ba6789 100644
--- a/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
@@ -15,10 +15,10 @@
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
-          label="机构名称"
+          label="部门名称"
           :hidden="false"
           hasFeedback>
-          <a-input id="departName" placeholder="请输入机构/部门名称" v-decorator="['departName', validatorRules.departName ]"/>
+          <a-input id="departName" placeholder="请输入部门/部门名称" v-decorator="['departName', validatorRules.departName ]"/>
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :hidden="seen" label="上级部门" hasFeedback>
           <a-tree-select
@@ -33,36 +33,33 @@
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
-          label="机构类型">
+          label="部门类型">
           <template v-if="seen">
-            <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
+            <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择部门类型">
               <a-radio value="1">
-                行政
+                管理机构
               </a-radio>
               <a-radio value="2">
-                教学
+                生产企业
+              </a-radio>
+              <a-radio value="4">
+                网店
               </a-radio>
               <a-radio value="5">
-                公司
+                门店
+              </a-radio>
+              <a-radio value="6">
+                供应商
+              </a-radio>
+              <a-radio value="7">
+                物流公司
               </a-radio>
             </a-radio-group>
           </template>
           <template v-else>
-            <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
-              <a-radio value="1">
-                行政
-              </a-radio>
-              <a-radio value="2">
-                教学
-              </a-radio>
+            <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择部门类型">
               <a-radio value="3">
-                班级
-              </a-radio>
-              <a-radio value="4">
-                分组
-              </a-radio>
-              <a-radio value="5">
-                公司
+                子部门
               </a-radio>
             </a-radio-group>
           </template>
@@ -138,8 +135,8 @@
         confirmLoading: false,
         form: this.$form.createForm(this),
         validatorRules: {
-          departName: {rules: [{required: true, message: '请输入机构/部门名称!'}]},
-          orgCode: {rules: [{required: true, message: '请输入机构编码!'}]},
+          departName: {rules: [{required: true, message: '请输入部门/部门名称!'}]},
+          orgCode: {rules: [{required: true, message: '请输入部门编码!'}]},
           mobile: {rules: [{validator: this.validateMobile}]}
         },
         url: {
diff --git a/ant-design-vue-jeecg/src/views/zyworkorder/modules/QRCode.vue b/ant-design-vue-jeecg/src/views/zyworkorder/modules/QRCode.vue
index a745e871..5975b44c 100644
--- a/ant-design-vue-jeecg/src/views/zyworkorder/modules/QRCode.vue
+++ b/ant-design-vue-jeecg/src/views/zyworkorder/modules/QRCode.vue
@@ -30,7 +30,7 @@
 
   import { httpAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
-  import { Print } from 'vue-print-nb'
+  import { Print } from 'vue-print-nb-jeecg'
   export default {
     name: "QRCode",
     components: {