Merge remote-tracking branch 'origin/dev' into dev

src/views/activiti/ProcessUserModelList.vue

@@ -74,7 +74,7 @@
       </span>
       <span slot="make" slot-scope="text, record">
         <div v-if="record.name!='预算计划采购流程' && record.name!='权限授权流程'">
-          <a href="javascript:void(0);" @click="getNodeData(record)" >审批人员</a>
+          <a href="javascript:void(0);" @click="openDepart(record)" >审批人员</a>
         </div>
       <!--  <div v-else-if="record.name!='权限授权流程'">
           <a href="javascript:void(0);" @click="getNodeData(record)" >审批人员</a>
@@ -230,6 +230,24 @@
         </a-button>
       </div>
     </a-modal>
+    <a-modal
+      title="选择项目部" width="900px" :maskClosable="false"
+      :confirmLoading="confirmLoading"
+      :visible="showDepartCode"
+      :footer="null"
+      @cancel="showDepartCode=false"
+    >
+      <a-row>
+        <a-form :form="departForm" >
+            <a-form-item label="项目部" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-select-depart v-decorator="['departId']"  />
+            </a-form-item>
+          <a-button @click="departSubmit" type="primary"  style="float: right">
+            确定
+          </a-button>
+        </a-form>
+      </a-row>>
+    </a-modal>
     <!--查看图片-->
     <a-modal
       :title="viewTitle" width="90%"
@@ -263,7 +281,6 @@
   import JSelectRole from '@/components/jeecgbiz/JSelectRole'
   import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
   import JDictSelectTag from "@/components/dict/JDictSelectTag"
-
   export default {
     name: "ProcessUserModelList",
     mixins:[activitiMixin,JeecgListMixin],
@@ -349,7 +366,7 @@
           visible: false,
         },
         editForm: this.$form.createForm(this),
-
+        departForm: this.$form.createForm(this),
         description: '已部署模型',
         // 查询条件
         queryParam: {
@@ -375,6 +392,8 @@
         nodeList:[],
         editNode:{},
         showProcessNodeEdit:false,
+        showDepartCode:false,
+        thisData:'',
         dictNodeType:{
           '0':'开始节点',
           '1':'审批节点',
@@ -553,6 +572,16 @@
           }
         });
       },
+      openDepart(row){
+        this.departForm.resetFields();
+        this.showDepartCode=true;
+        this.thisData=row;
+      },
+      departSubmit(){
+        let departCode=this.departForm.getFieldValue('departId');
+        this. getNodeData(this.thisData,departCode);
+
+      },
       //提交并保存
       sprySubmit() {
         console.log(this.nodeList,this.isIndex,"---------------->")
@@ -571,18 +600,16 @@
 
       },
       /*节点设置*/
-      getNodeData(row){
+      getNodeData(row,departCode){
-        let is_project = sessionStorage.getItem('IS_PROJECT')
+        if (!departCode){
-        let projcet= JSON.parse(is_project)
+          this.$message.error("项目部不能为空");
-        if (!projcet.departId){
-          this.$message.error("无权限");
           return;
         }
         let _this = this;
         _this.updateRow = row;
         _this.postFormAction(_this.url.getProcessNodeByDepart,{
           id:row.id,
-          departId:projcet.departId
+          departId:departCode
         }).then(res => {
           if (res.success) {
             // 转换null为""
@@ -632,6 +659,7 @@
                 _this.$message.success("操作成功");
                 _this.loadData();
                 _this.editObj.visible = false;
+                _this.showDepartCode=false;
               }else {
                 _this.$message.error(res.message);
               }