Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

klp-ui/src/views/wms/stockIo/panels/detail.vue

@@ -29,7 +29,13 @@
                 <dict-tag :options="dict.type.stock_item_type" :value="scope.row.itemType" />
               </template>
             </el-table-column>
-            <el-table-column label="物品ID" align="center" prop="itemId" />
+            <el-table-column label="物品信息" align="center" prop="itemId">
+              <template slot-scope="scope">
+                <raw-material-info v-if="scope.row.itemType === ITEM_TYPE.RAW_MATERIAL" :material-id="scope.row.itemId" />
+                <product-info v-else-if="scope.row.itemType === ITEM_TYPE.PRODUCT" :product-id="scope.row.itemId" />
+                <span v-else>{{ scope.row.itemId }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="数量" align="center" prop="quantity" />
             <el-table-column label="单位" align="center" prop="unit" />
             <!-- <el-table-column label="批次号" align="center" prop="batchNo" /> -->

klp-ui/src/views/workflow/work/start.vue

@@ -6,25 +6,13 @@
       </div>
       <el-col :span="18" :offset="3">
         <div class="form-conf" v-if="formOpen">
-          <parser :key="new Date().getTime()" :form-conf="formData" ref="parser" @getData="getData"/>
+          <parser :key="parserKey" :form-conf="formData" ref="parser" @getData="getData"/>
         </div>
 
         <!-- 审批负责人设置 -->
-        <el-card class="box-card" shadow="hover" v-if="formOpen">
+        <el-col :span="10" :offset="3">
-          <div slot="header" class="clearfix">
-            <span>审批人设置</span>
-          </div>
           <el-form ref="approvalForm" :model="approvalForm" label-width="120px">
-            <el-form-item label="审批负责人">
+            <el-form-item label="指定审批人">
-              <el-radio-group v-model="approvalForm.approvalType">
-                <el-radio :label="1">指定用户</el-radio>
-                <el-radio :label="2">角色</el-radio>
-                <el-radio :label="3">部门</el-radio>
-                <el-radio :label="4">发起人</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            
-            <el-form-item v-if="approvalForm.approvalType === 1">
               <el-tag
                 :key="index"
                 v-for="(item, index) in approvalUsers"
@@ -36,7 +24,7 @@
               <el-button class="button-new-tag" type="primary" icon="el-icon-plus" size="mini" circle @click="onSelectUsers" />
             </el-form-item>
           </el-form>
-        </el-card>
+        </el-col>
 
         <!-- 提交和重置按钮 -->
         <div class="submit-buttons" v-if="formOpen">
@@ -116,6 +104,7 @@ export default {
       procInsId: null,
       formOpen: false,
       formData: {},
+      parserKey: 1,
       // 审批表单
       approvalForm: {
         approvalType: 1, // 默认指定用户
@@ -162,6 +151,9 @@ export default {
       }).then(res => {
         if (res.data) {
           this.formData = res.data;
+          // 表单按钮隐藏
+          this.formData.formBtns = false;
+          this.parserKey++   // 只有加载新表单时才更新 key
           this.formOpen = true
         }
       })
@@ -212,21 +204,6 @@ export default {
             formData.flowable.candidateUsers = this.approvalUsers.map(user => user.userId).join(',');
             formData.flowable.candidateGroups = '';
             formData.flowable.text = this.approvalUsers.map(user => user.nickName).join(',');
-          } else if (this.approvalForm.approvalType === 2) {
-            // 角色
-            formData.flowable = formData.flowable || {};
-            formData.flowable.candidateUsers = '';
-            formData.flowable.candidateGroups = 'ROLE_';
-          } else if (this.approvalForm.approvalType === 3) {
-            // 部门
-            formData.flowable = formData.flowable || {};
-            formData.flowable.candidateUsers = '';
-            formData.flowable.candidateGroups = 'DEPT_';
-          } else if (this.approvalForm.approvalType === 4) {
-            // 发起人
-            formData.flowable = formData.flowable || {};
-            formData.flowable.candidateUsers = '';
-            formData.flowable.candidateGroups = '';
           }
 
           // 启动流程并将表单数据加入流程变量