From 943bde252adeed880ed20bbf6b886ce0ad64b6f5 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Mon, 14 Nov 2022 18:16:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=A0=B8=E4=BA=BA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jeecg/PEditableTable.vue       | 18 ++--
 .../jeecgbiz/modal/JSelectUserByDepModal.vue  |  2 +
 src/views/activiti/PSelectPosition.vue        | 47 ++++++++++
 src/views/activiti/ProcessModelList.vue       | 85 ++++++++++++-------
 .../ProcessWasteMaterialsList.vue             |  2 +-
 5 files changed, 110 insertions(+), 44 deletions(-)
 create mode 100644 src/views/activiti/PSelectPosition.vue

diff --git a/src/components/jeecg/PEditableTable.vue b/src/components/jeecg/PEditableTable.vue
index d1ec42c..6ee7a3a 100644
--- a/src/components/jeecg/PEditableTable.vue
+++ b/src/components/jeecg/PEditableTable.vue
@@ -956,17 +956,13 @@
 
 
       a(){
-        console.log("执行l");
-        this.getSelection((a,b,c)=>{
-          console.log(a,b,c);
-          // b.forEach(item =>{
-          //   console.log(item);
-          // });
-        });
-
-
-
-
+        // console.log("执行l");
+        // this.getSelection((a,b,c)=>{
+        //   console.log(a,b,c);
+        //   // b.forEach(item =>{
+        //   //   console.log(item);
+        //   // });
+        // });
       },
 
       getElement(id, noCaseId = false) {
diff --git a/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue b/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue
index b324189..1bc6990 100644
--- a/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue
+++ b/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue
@@ -183,7 +183,9 @@
         }
         if (this.selectedDepIds && this.selectedDepIds.length > 0) {
           await this.initQueryUserByDepId(this.selectedDepIds)
+          console.log("这边1");
         } else {
+          console.log("这边2");
           this.loading = true
           let params = this.getQueryParams()//查询条件
           await getUserList(params).then((res) => {
diff --git a/src/views/activiti/PSelectPosition.vue b/src/views/activiti/PSelectPosition.vue
new file mode 100644
index 0000000..ff9295a
--- /dev/null
+++ b/src/views/activiti/PSelectPosition.vue
@@ -0,0 +1,47 @@
+<template>
+  <j-select-biz-component
+    :value="value"
+    :ellipsisLength="20"
+    :listUrl="url.list"
+    :columns="columns"
+    v-on="$listeners"
+    v-bind="attrs"
+  />
+</template>
+
+<script>
+import JSelectBizComponent from '@/components/jeecgbiz/JSelectBizComponent'
+
+export default {
+  name: 'PSelectPosition',
+  components: { JSelectBizComponent },
+  props: ['value'],
+  data() {
+    return {
+      url: {
+        list: '/sys/user/list'
+      },
+      queryParamCode: 'realname',
+      queryParamText: '人员名称',
+      columns: [
+        { title: '人员名称', dataIndex: 'realname', align: 'center', width: '30%', widthRight: '70%' },
+        { title: '职务', dataIndex: 'post', align: 'center', width: '35%' },
+        { title: '部门', dataIndex: 'orgCodeTxt', align: 'center', width: '25%' }
+      ],
+      default:{
+        name: '人员名称',
+        displayKey: 'realname',
+        width: 1200,
+        returnKeys: ['realname', 'id'],
+      }
+    }
+  },
+  computed: {
+    attrs() {
+      return Object.assign({ value: this.value }, this.default, this.$attrs)
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped></style>
\ No newline at end of file
diff --git a/src/views/activiti/ProcessModelList.vue b/src/views/activiti/ProcessModelList.vue
index cfd8c16..d34f345 100644
--- a/src/views/activiti/ProcessModelList.vue
+++ b/src/views/activiti/ProcessModelList.vue
@@ -37,6 +37,7 @@
             <a-col :md="6" :sm="12" >
                 <a-button type="primary"  style="left: 10px" @click="searchQuery" icon="search">查询</a-button>
                 <a-button type="primary"  @click="searchReset" icon="reload" style="margin-left: 8px;left: 10px">重置</a-button>
+<!--                <a-button type="primary"  style="left: 10px" @click="shuttle" icon="search">选择审核人员</a-button>-->
             </a-col>
           </span>
           <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
@@ -49,6 +50,7 @@
       </a-form>
     </div>
 
+
     <!-- table区域-begin -->
     <a-table :scroll="{x:2200,y:500}" bordered
       ref="table"
@@ -59,12 +61,13 @@
       :loading="loading"
       @change="handleTableChange">
 
-      <a-table-column title="#" :width="50" fixed='left' key="a">
+      <a-table-column title="序号" align="center" :width="50"  key="a">
+<!--      <a-table-column title="#" :width="50" fixed='left' key="a">-->
         <template slot-scope="t,r,i" >
           <span> {{i+1}} </span>
         </template>
       </a-table-column>
-      <a-table-column title="流程名称" dataIndex="name" :width="200" align="center" fixed='left'>
+      <a-table-column title="流程名称" dataIndex="name" :width="200" align="center" >
         <template slot-scope="t,r,i">
           <span> {{t}} </span>
         </template>
@@ -74,12 +77,12 @@
           <span> {{t}} </span>
         </template>
       </a-table-column>
-      <a-table-column title="版本" dataIndex="version" key="asa" :width="100" align="center"
-                       :sorter="(a, b) => a.version - b.version">
-        <template slot-scope="t,r,i">
-          <span> v.{{t}} </span>
-        </template>
-      </a-table-column>
+<!--      <a-table-column title="版本" dataIndex="version" key="asa" :width="100" align="center"-->
+<!--                       :sorter="(a, b) => a.version - b.version">-->
+<!--        <template slot-scope="t,r,i">-->
+<!--          <span> v.{{t}} </span>-->
+<!--        </template>-->
+<!--      </a-table-column>-->
       <a-table-column title="所属分类" dataIndex="categoryId" :width="200" align="center" key="categoryId_"
                       :filters = "lcTypeF" @filter="filter_categoryId">
         <template slot-scope="t,r,i">
@@ -96,12 +99,12 @@
           <span @click="viewForm(t)" style="color: blue;cursor: pointer;"> {{getFormComponent(t).text}} </span>
         </template>
       </a-table-column>
-      <a-table-column title="状态" dataIndex="status" :width="200" align="center">
-        <template slot-scope="t,r,i">
-          <span v-if="t==1" style="color: #00A0E9;"> 已启用 </span>
-          <span v-if="t!=1" style="color: #999;"> 未启用 </span>
-        </template>
-      </a-table-column>
+<!--      <a-table-column title="状态" dataIndex="status" :width="200" align="center">-->
+<!--        <template slot-scope="t,r,i">-->
+<!--          <span v-if="t==1" style="color: #00A0E9;"> 已启用 </span>-->
+<!--          <span v-if="t!=1" style="color: #999;"> 未启用 </span>-->
+<!--        </template>-->
+<!--      </a-table-column>-->
       <a-table-column title="备注说明" dataIndex="description" :width="200" align="center">
         <template slot-scope="t,r,i">
           <j-ellipsis :value="t" :length="10"/>
@@ -120,11 +123,11 @@
       <a-table-column title="操作" dataIndex=""  align="center" :width="250" fixed='right'>
         <template slot-scope="t,r,i">
 
-          <a href="javascript:void(0);" v-if="r.status!=1" @click="editStatus(1,r)" style="color: rgb(144,96,255);">启用</a>
-          <a href="javascript:void(0);" v-if="r.status==1" @click="editStatus(0,r)" style="color: #cb892d">禁用</a>
-          <a-divider type="vertical" />
-          <a href="javascript:void(0);" @click="getNodeData(r)" >审批人员</a>
-          <a-divider type="vertical" />
+<!--          <a href="javascript:void(0);" v-if="r.status!=1" @click="editStatus(1,r)" style="color: rgb(144,96,255);">启用</a>-->
+<!--          <a href="javascript:void(0);" v-if="r.status==1" @click="editStatus(0,r)" style="color: #cb892d">禁用</a>-->
+<!--          <a-divider type="vertical" />-->
+<!--          <a href="javascript:void(0);" @click="getNodeData(r)" >审批人员</a>-->
+<!--          <a-divider type="vertical" />-->
          <!-- <a href="javascript:void(0);" @click="convertToModel(r)" >转为模型</a>-->
          <!-- <br>-->
           <a href="javascript:void(0);"  @click="edit(r)">配置表单</a> <a-divider type="vertical" />
@@ -184,6 +187,15 @@
         <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="排序" >
           <a-input-number  v-decorator="[ 'sort', {initialValue:editObj.sort, rules: []}]" placeholder="排序"/>
         </a-form-item>
+
+
+        <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="请选择审核人员"  >
+            <!--  通过部门选择用户控件 -->
+<!--            <j-select-user-by-dep v-model="spry.userIds" :multi="false" @submitUsers="submitUsers"></j-select-user-by-dep>-->
+            <p-select-position placeholder="请选择审核人员" :multiple="true" :buttons="false" v-decorator="[ 'userIds', {initialValue:editObj.userIds, rules: [{ required: true, message: '不能为空' }] },]" />
+        </a-form-item>
+
+
         <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="备注描述" >
           <a-textarea  v-decorator="[ 'description', {initialValue:editObj.description, rules: []}]" placeholder="备注描述" :autoSize="{ minRows: 3, maxRows: 5 }" />
         </a-form-item>
@@ -201,7 +213,7 @@
         <a-col :md="4" :sm="4" style="border-right: 1px solid #999">
 <!--          选择流程节点-->
           <a-steps direction="vertical" :current="current" size="small">
-            <template  v-for="item,i in nodeList">
+            <template  v-for="(item,i) in nodeList">
               <a-step style="cursor: pointer;" :title="item.title"
                       :description="item.description" :status="i==current?'process':'wait'"
                       @click="change_steps(item,i)"/>
@@ -315,13 +327,14 @@
   import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
   import JSelectRole from '@/components/jeecgbiz/JSelectRole'
   import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
+  import PSelectPosition from '@/views/activiti/PSelectPosition'
 
   export default {
     name: "ProcessModelList",
     mixins:[activitiMixin,JeecgListMixin],
     components: {
       JEllipsis,JSelectUserByDep,JSelectRole,JSelectDepart
-      ,JTreeSelect,JTreeDict
+      ,JTreeSelect,JTreeDict,PSelectPosition,
     },
     created(){
       // this.initReportList();
@@ -397,7 +410,8 @@
         isIndex:0,
         lcTypeF:[],
         dataList: [],
-        updateRow: {}
+        updateRow: {},
+        isShuttle: false
       }
     },
     computed:{
@@ -408,6 +422,12 @@
       },
     },
     methods: {
+
+      shuttle(){
+        this.isShuttle = true;
+      },
+
+
       /*initReportList(){
         // 加载reportList
         getAction('/report/reportModel/all',{}).then(res=>{
@@ -448,6 +468,7 @@
         this.spryTypes=[],
         this.spry={}
         this.isIndex=0;
+        this.isShuttle = false;
       },
       /*编辑流程节点*/
 
@@ -601,16 +622,16 @@
           if (!err) {
             let formData = Object.assign(this.editObj, values)
             console.log("formData",formData)
-            this.confirmLoading = true;
-            this.postFormAction(this.url.updateInfo,formData).then(res => {
-              if (res.success) {
-                _this.$message.success("操作成功");
-                _this.loadData();
-                _this.editObj.visible = false;
-              }else {
-                _this.$message.error(res.message);
-              }
-            }).finally(() => _this.confirmLoading = false);;
+            // this.confirmLoading = true;
+            // this.postFormAction(this.url.updateInfo,formData).then(res => {
+            //   if (res.success) {
+            //     _this.$message.success("操作成功");
+            //     _this.loadData();
+            //     _this.editObj.visible = false;
+            //   }else {
+            //     _this.$message.error(res.message);
+            //   }
+            // }).finally(() => _this.confirmLoading = false);;
           }
         })
       },
diff --git a/src/views/wastematerials/ProcessWasteMaterialsList.vue b/src/views/wastematerials/ProcessWasteMaterialsList.vue
index 6a68d59..2aca6bb 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsList.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsList.vue
@@ -139,7 +139,7 @@
             dataIndex: 'materialGroup'
           },
           {
-            title:'物料',
+            title:'物料编号',
             align:"center",
             dataIndex: 'materialNumber'
           },