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

src/views/activiti/applyList.vue

@@ -79,7 +79,9 @@
       </span>
       <span slot="action" slot-scope="text, r">
           <template v-if="r.status == 0">
-            <a href="javascript:void(0);" style="color: #00A0E9" @click="apply(r)" >提交申请</a>
+             <a-popconfirm title="确定提交申请吗?" @confirm="() => apply(r)">
+              <a href="javascript:void(0);" style="color:#00A0E9;">提交申请</a>
+            </a-popconfirm>
             <a-divider type="vertical" />
             <a href="javascript:void(0);" @click="edit(r)" style="color: #000000">编辑提交数据</a>
             <a-divider type="vertical" />
@@ -164,9 +166,9 @@
 <!--       -->
     </a-modal>
     <!--提交申请表单-->
-    <a-modal title="提交申请" v-model="modalVisible" :mask-closable="false" :width="500" :footer="null">
+<!--    <a-modal title="提交申请" v-model="modalVisible" :mask-closable="false" :width="500" :footer="null">
       <div v-if="modalVisible">
-        <!--     <a-form-item label="选择审批人" v-show="showAssign">
+        &lt;!&ndash;     <a-form-item label="选择审批人" v-show="showAssign">
                <a-select style="width: 100%"
                  v-model="form.assignees"
                  placeholder="请选择"
@@ -178,7 +180,7 @@
              </a-form-item>
              <a-form-item label="下一审批人" v-show="isGateway">
                <a-alert  type="info" showIcon message="分支网关处不支持自定义选择下一审批人，将自动下发给所有可审批人。">，将发送给下一节点所有人</a-alert>
-             </a-form-item>-->
+             </a-form-item>&ndash;&gt;
         <a-form-item label="优先级" prop="priority">
           <a-select v-model="form.priority" placeholder="请选择" :allowClear="true" style="width: 100%">
             <a-select-option :value="0">普通</a-select-option>
@@ -188,8 +190,8 @@
         </a-form-item>
         <a-form-item label="消息通知" v-show="false">
           <a-checkbox v-model="form.sendMessage">站内消息通知</a-checkbox>
-          <!--  <a-checkbox v-model="form.sendSms" disabled>短信通知</a-checkbox>
-            <a-checkbox v-model="form.sendEmail" disabled>邮件通知</a-checkbox>-->
+          &lt;!&ndash;  <a-checkbox v-model="form.sendSms" disabled>短信通知</a-checkbox>
+            <a-checkbox v-model="form.sendEmail" disabled>邮件通知</a-checkbox>&ndash;&gt;
         </a-form-item>
         <div slot="footer">
           <a-button type="text" @click="modalVisible=false">取消</a-button>
@@ -197,7 +199,7 @@
           <a-button type="primary" :disabled="submitLoading" @click="applySubmit">提交</a-button>
         </div>
       </div>
-    </a-modal>
+    </a-modal>-->
     <a-modal title="审批历史" v-model="modalLsVisible" :mask-closable="false" :width="'80%'" :footer="null">
       <div v-if="modalLsVisible">
         <historicDetail :procInstId="procInstId"></historicDetail>
@@ -462,6 +464,7 @@
               });
               this.form.assignees = ids;
               this.showAssign = true;
+
             } else {
               this.form.assignees = [];
               this.showAssign = true;
@@ -471,7 +474,8 @@
               this.$message.error(this.error)
               return;
             }
-            this.modalVisible = true;
+            //this.modalVisible = true;
+            this.applySubmit();
           }else {
             this.$message.error(res.message)
           }

src/views/activiti/form/ProcessMaterialWarehousingForm.vue

@@ -54,7 +54,7 @@
           </a-col>
           <a-col :span="8">
             <a-form-item label="入库目标库" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['targetLibrary']" placeholder="入库目标库" style="width: 100%" disabled />
+              <j-select-depart v-decorator="['targetLibrary']" multi disabled />
               <!--              <a-radio v-for="item in puwwOptions" :key="item.id" :label="item.invisibleCode" :value="item.id"></a-radio>-->
             </a-form-item>
           </a-col>
@@ -141,7 +141,6 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
     },
     data() {
       return {
-        libraryAssociationIdInvisible:'ZK',
         invisibleCode:null,
         puwwOptions: [],
         labelCol: {
@@ -461,7 +460,7 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
             formData.procDefId = this.processData.id
             formData.procDeTitle = this.processData.name
             formData.title = this.processData.description
-            formData.targetLibrary = this.libraryAssociationIdInvisible
+            formData.targetLibrary = this.targetLibrary
             formData.processUdgetPlanId=this.processUdgetPlanIds
             if (!formData.tableName) formData.tableName = this.processData.businessTable
             var url = this.url.addWarehousingApply
@@ -521,7 +520,7 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
             formData.procDefId = this.processData.id
             formData.procDeTitle = this.processData.name
             formData.title = this.processData.description
-            formData.targetLibrary = this.libraryAssociationIdInvisible
+            formData.targetLibrary = this.targetLibrary
             formData.processUdgetPlanId=this.processUdgetPlanIds
             if (!formData.tableName) formData.tableName = this.processData.businessTable
             var url = this.url.add
@@ -684,14 +683,12 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
       let invisibleCode = null
       getAction(this.url.puwwlist, params).then((rest) => {
         if (rest.success) {
-          invisibleCode = rest.result.invisibleCode
-          this.libraryAssociationIdInvisible = rest.result.unit
+          invisibleCode = rest.result.unit
         }
-
         let param = {}
         param.createBy = res.username
         param.company = company
-        param.targetLibrary = invisibleCode == null ? 'ZK' : invisibleCode
+        param.targetLibrary = invisibleCode == null ? '' : invisibleCode
         param.departId = res.departIds
         param.createTime = getCurrentTime()
         this.data = param