Merge branch 'test' into dev

src/views/bpm/handleTask/components/bomApproverJSdevice/detailDialog.vue

@@ -85,7 +85,7 @@
           "
         >
           <el-option
-            v-for="item in gysList"
+            v-for="(item,index) in gysList"
            :key="item.id + index"  
             :value="item.id"
             :label="item.name"
@@ -132,10 +132,11 @@
         visible: false,
         title: '',
         gysList: [],
-
+        baseCount:'',
+        unit:'',
         materielDesignationPL: null,
         supplierIdPL: null,
-
+        
         columns: [
           {
             label: '序号',
@@ -226,7 +227,7 @@
         ],
         statusOpt: {
           '': '全部',
-          0: '已停用',
+          0: '草稿',
           1: '已发布'
         }
       };

src/views/bpm/handleTask/formParser/formParserDialog.vue

@@ -16,7 +16,6 @@
       ref="generateForm"
     >
     </fm-generate-form>
-
     <div slot="footer" class="dialog-footer">
       <el-form label-width="100px" ref="formRef" :model="form">
         <el-form-item
@@ -60,7 +59,9 @@
           <el-dropdown-item command="cancel">作废</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
-    </div>
+    </div>  
+
+
   </ele-modal>
 </template>
 <script>
@@ -81,20 +82,21 @@ export default {
   data() {
     return {
       form:{},
+      index:"",
       jsonData: {},
     }
   },
   methods: {
     open(row){
-      this.form = _.cloneDeep(row)
-      this.jsonData = JSON.parse(this.form.formJson.makingJson);
-      this.jsonData.config.dataSource &&
-      this.jsonData.config.dataSource.forEach((item) => {
-        item.headers = {
-          Authorization: getToken()
-        };
-        // item.url = item.url && item.url.replace('/api', this.APIUrl);
-      });
+      // this.form = _.cloneDeep(row)
+      // this.jsonData = JSON.parse(this.form.formJson.makingJson);
+      // this.jsonData.config.dataSource &&
+      // this.jsonData.config.dataSource.forEach((item) => {
+      //   item.headers = {
+      //     Authorization: getToken()
+      //   };
+      //   // item.url = item.url && item.url.replace('/api', this.APIUrl);
+      // });
     },
     cancel() {
       this.$emit('update:formParserDialogFlag', false);

src/views/bpm/handleTask/index.vue

@@ -62,7 +62,7 @@
               @submit="submit"
               @handleClose="handleClose"
               ref="subForm"
-            ></async-sub-form-component>
+            ></async-sub-form-component> 
           </div>
           <div> </div>
           <!-- <el-col :span="16" :offset="6">
@@ -460,7 +460,7 @@
           }
           // 设置流程信息
           console.log('==', response);
-          console.log('==', this.listData);
+          console.log('==++++++++++++++++', this.listData.pcViewRouter);
           this.processInstance = response;
           // //将业务表单，注册为动态组件
           // let formCustomCreatePath = JSON.parse(
@@ -468,6 +468,9 @@
           // );
           // const bizpath = formCustomCreatePath.pcView;
           // const subpath = formCustomCreatePath.pcHandle;
+
+
+
           Vue.component('async-biz-form-component', (resolve) => {
             require([`@/views${this.listData.pcViewRouter}`], resolve);
           });

src/views/bpm/todo/index.vue

@@ -144,7 +144,7 @@
 <script>
   import { getTodoTaskPage } from '@/api/bpm/task';
   import handleTask from '@/views/bpm/handleTask/index.vue';
-  import handleFormParserTask from '@/views/bpm/handleTask/formParser/formParserDialog.vue';
+  import handleFormParserTask from '@/views/bpm/handleTask/formParser/formParserDialog.vue'; //处理
   import detail from '@/views/bpm/processInstance/detail.vue';
   import inOut from '../outgoingManagement/add.vue';
 
@@ -272,6 +272,10 @@
       /** 处理审批按钮 */
 
       handleAudit(type, row) {
+
+        console.log(type, row,'-------');
+        // return
+
         if (type == 'audit') {
           if (Object.keys(row.formJson).length) {
             console.log('处理1');
@@ -298,6 +302,7 @@
             });
           }
         } else {
+          console.log(1111);
           this.$refs.detailRef.open(row.processInstance.id);
         }
       }