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

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -1718,9 +1718,10 @@
               this.verifySarStandard = this.$route.query.verifySarStandard
               let mes = JSON.parse(res.mes)
               mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-              this.form = mes.form
               this.roleForm = mes.roleForm
               this.commentText = mes.commentText
+              //表单文件处理
+              this.getFormFieldList(mes.form)
             })
           },
           // 将文本状态的id与name对应
@@ -2597,6 +2598,8 @@
             },
             //保存
             handleSave() {
+              //文件处理
+              this.fileInfoHandle();
               this.form.country=this.countryArr;
               // if(item.country !== undefined && item.country !== null){
               //   this.sarStandardsInfoEO.country = item.country.split(",");

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -1344,7 +1344,14 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew,saveTaskForPub,queryTaskFirst} from 'api/process'
+import {
+  inboundLiaisonDetail,
+  processCreateStand,
+  changeAssigneeNew,
+  saveTaskForPub,
+  queryTaskFirst,
+  saveTaskFirst
+} from 'api/process'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 
@@ -1591,7 +1598,6 @@ export default {
       prcName : this.$route.query.prcName,
       // 调整处理人抽屉状态
       drawerModal: false,
-      drawerTitle: '',
       nodeList: [],
       selectPeople:'',
     }
@@ -1628,9 +1634,11 @@ export default {
       }).then(res => {
         let mes = JSON.parse(res.mes)
         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-        this.form = mes.form
         this.roleForm = mes.roleForm
         this.commentText = mes.commentText
+        this.taskIds=mes.taskIds
+        //表单文件处理
+        this.getFormFieldList(mes.form)
       })
     },
     choiceZRR1 (type, title, id) {
@@ -2001,7 +2009,7 @@ export default {
             break;
           default : ;
         }
-        console.log("caNmae",this.form.caName);
+        // console.log("caNmae",this.form.caName);
         this.$message({
           showClose: true,
           message: response.message,
@@ -2072,7 +2080,7 @@ export default {
       this.fileMadel = true
 
     },fileChange(fileList){
-      console.log("fileList",fileList);
+      // console.log("fileList",fileList);
     },
     // popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
     //   if(checkedData) {
@@ -2209,6 +2217,7 @@ export default {
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
+          console.log("错误")
         })
       })
     },
@@ -2313,18 +2322,24 @@ export default {
       this.active = name
     },
     handleSave() {
+      //表单文件处理
+      this.fileInfoHandle();
       this.form.country=this.countryArr;
       this.saveLoading = true
       let _formData = new FormData()
       // _formData.append('id', this.bpnId)
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.uName)
+      _formData.append('prcType', '1')
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
         form: this.form,
         roleForm: this.roleForm,
         commentText: this.commentText,
         taskInfo: '申请人修订',
+        taskIds:this.taskIds
       }))
-      saveTaskForPub(_formData).then(res => {
+      saveTaskFirst(_formData).then(res => {
         this.saveLoading = false
         this.$message.success('保存成功')
         // this.bpnId = res.result

src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue

@@ -395,6 +395,41 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="产品线" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.productLine"
+                    placeholder="请输入产品线"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="产品线责任人" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.uname"
+                    placeholder="请输入产品线责任人"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    :loading="searching"
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission=""
+                    @click="getProductData">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission=""
+                    @click="clearProject">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
             <el-table
               :data="productData"
               tooltip-effect="dark"
@@ -490,6 +525,10 @@ export default {
         standType: "",
         standName: ""
       },
+      projectSearch: {
+        productLine: '',
+        uname: '',
+      },
       standardTypeOptions: [
         {
           value: "INLAND",
@@ -933,11 +972,20 @@ export default {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
       this.getProductData();
     },
+    //清空产品线数据
+    clearProject(){
+      this.projectSearch = {
+        productLine: '',
+        uname: '',
+      }
+      this.getProductData()
+    },
     //获取产品线数据
     getProductData() {
       this.$http.get("sarStandProjectLibrary/queryProjectManager", {
         current: this.pageNo,
-        pageSize: this.pageSizeNo
+        PageSize: this.pageSizeNo,
+        ...this.projectSearch
       }, {
         _this: this
       }, res => {

src/pages/processCenter/pages/creatProcess/xmpg/step1.vue

@@ -397,6 +397,41 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="产品线" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.productLine"
+                    placeholder="请输入产品线"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="产品线责任人" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.uname"
+                    placeholder="请输入产品线责任人"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    :loading="searching"
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission=""
+                    @click="getProductData">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission=""
+                    @click="clearProject">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
             <el-table
               :data="productData"
               tooltip-effect="dark"
@@ -488,6 +523,10 @@ export default {
       // 查询相关参数
       searching: false,
       fileType: "FBGBJBD",
+      projectSearch: {
+        productLine: '',
+        uname: '',
+      },
       standardSearch: {
         standType: "",
         standName: ""
@@ -930,11 +969,20 @@ export default {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
       this.getProductData();
     },
+    //清空产品线数据
+    clearProject(){
+      this.projectSearch = {
+        productLine: '',
+        uname: '',
+      }
+      this.getProductData()
+    },
     //获取产品线数据
     getProductData() {
       this.$http.get("sarStandProjectLibrary/queryProjectManager", {
         current: this.pageNo,
-        pageSize: this.pageSizeNo
+        PageSize: this.pageSizeNo,
+        ...this.projectSearch
       }, {
         _this: this
       }, res => {