部门

src/components/jeecgbiz/JSelectDepart.vue

@@ -95,6 +95,7 @@
         this.$refs.innerDepartSelectModal.show()
       },
       handleOK(rows, idstr) {
+        console.log("当前选中部门ID", idstr)
         let value = ''
         if (!rows && rows.length <= 0) {
           this.departNames = ''

src/components/jeecgbiz/JSelectUserByDep.vue

@@ -43,7 +43,11 @@
     data() {
       return {
         userIds: "",
-        userNames: ""
+        userNames: "",
+        //部门
+        orgCodeTxt:"",
+        //部门id
+        id:""
       }
     },
     mounted() {
@@ -76,9 +80,23 @@
           for (let item of rows) {
             temp += ',' + item.realname
           }
+
+          let demp = ''
+          for (let item of rows) {
+            demp += ',' + item.orgCodeTxt
+          }
+          let idmp = ''
+          for (let item of rows) {
+            idmp += ',' + item.id
+          }
           this.userNames = temp.substring(1)
           this.userIds = idstr
+          this.orgCodeTxt = demp.substring(1)
+          this.id = idmp.substring(1)
+          // console.log("当前选中用户部门", this.orgCodeTxt)
+          // console.log("当前选中用户部门Id", this.id)
         }
+        this.$emit('orgCodeTxt',this.orgCodeTxt)
         this.$emit("change", this.userIds)
       }
     }

src/views/activiti/form/ProcessMaterialBorrowingForm.vue

@@ -4,6 +4,11 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
+          <a-col :span="8" >
+            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-select-user-by-dep v-decorator="['createBy']" />
+            </a-form-item>
+          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-company v-decorator="['updateFirm']" multi />
@@ -14,11 +19,6 @@
               <j-select-depart v-decorator="['sysOrgCode']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="8" >
-            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-user-by-dep v-decorator="['createBy']" />
-            </a-form-item>
-          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />

src/views/activiti/form/ProcessMaterialWarehousingForm.vue

@@ -4,19 +4,20 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
+
           <a-col :span="8" >
-            <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-company v-decorator="['company']" multi />
+            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-select-user-by-dep v-decorator="['createBy']" />
             </a-form-item>
           </a-col>
           <a-col :span="8" >
-            <a-form-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-depart v-decorator="['sysOrgCode']" multi />
+            <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol" aria-readonly="true">
+              <j-select-company v-decorator="['company']" multi />
             </a-form-item>
           </a-col>
           <a-col :span="8" >
-            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-user-by-dep v-decorator="['createBy']" />
+            <a-form-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-select-depart v-decorator="['sysOrgCode']" multi />
             </a-form-item>
           </a-col>
           <a-col :span="8" >

src/views/activiti/form/ProcessMaterialsAllotForm.vue

@@ -4,6 +4,11 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
+          <a-col :span="8" >
+            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-select-user-by-dep v-decorator="['createBy']" />
+            </a-form-item>
+          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-company v-decorator="['company']" multi />
@@ -14,11 +19,6 @@
               <j-select-depart v-decorator="['sysOrgCode']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="8" >
-            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-user-by-dep v-decorator="['createBy']" />
-            </a-form-item>
-          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />

src/views/activiti/form/ProcessMaterialsDeliveryForm.vue

@@ -4,6 +4,11 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
+          <a-col :span="8" >
+            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-select-user-by-dep v-decorator="['createBy']" />
+            </a-form-item>
+          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-company v-decorator="['company']" multi />
@@ -14,11 +19,6 @@
               <j-select-depart v-decorator="['sysOrgCode']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="8" >
-            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-user-by-dep v-decorator="['createBy']" />
-            </a-form-item>
-          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />

src/views/activiti/form/ProcessMaterialsReturnForm.vue

@@ -4,6 +4,11 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
+          <a-col :span="8" >
+            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-select-user-by-dep v-decorator="['createBy']" />
+            </a-form-item>
+          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-company v-decorator="['company']" multi />
@@ -14,11 +19,6 @@
               <j-select-depart v-decorator="['sysOrgCode']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="8" >
-            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-user-by-dep v-decorator="['createBy']" />
-            </a-form-item>
-          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />

src/views/activiti/form/ProcessSmaterialsScrapForm.vue

@@ -4,6 +4,11 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
+          <a-col :span="8" >
+            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-select-user-by-dep v-decorator="['createBy']" />
+            </a-form-item>
+          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-company v-decorator="['company']" multi />
@@ -14,11 +19,6 @@
               <j-select-depart v-decorator="['sysOrgCode']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="8" >
-            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-user-by-dep v-decorator="['createBy']" />
-            </a-form-item>
-          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />

src/views/activiti/form/ProcessSpecialMaterialsForm.vue

@@ -4,6 +4,11 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
+          <a-col :span="8" >
+            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-select-user-by-dep v-decorator="['createBy']" />
+            </a-form-item>
+          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-company v-decorator="['company']" multi />
@@ -14,11 +19,6 @@
               <j-select-depart v-decorator="['sysOrgCode']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="8" >
-            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-user-by-dep v-decorator="['createBy']" />
-            </a-form-item>
-          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -11,18 +11,18 @@
             </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-company v-decorator="['company']" multi/>
+            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-select-user-by-dep v-decorator="['createBy']"/>
             </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-depart v-decorator="['sysOrgCode']" multi/>
+            <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-select-company v-decorator="['company']" multi/>
             </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-user-by-dep v-decorator="['createBy']"/>
+            <a-form-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-select-depart @orgCodeTxt="orgCodeTxt" v-decorator="['sysOrgCode']" multi/>
             </a-form-item>
           </a-col>
           <a-col :span="8">
@@ -440,6 +440,9 @@
           processUdgetPlanMaterialList: allValues.tablesValue[0].values
         }
       },
+      orgCodeTxt(a){
+        console.log("当前选中用户部门",a)
+      },
       //渲染流程表单数据
       showFlowData() {
         if (this.formBpm === true) {