Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!311

src/pages/home2/components/todoList/index.vue

@@ -1803,7 +1803,7 @@ export default {
 .to-do-list {
   margin-right: 10px;
   border-radius: 3px;
-  height: calc(~'100% - 269px');
+  height: calc(~'100% - 245px');
   overflow: hidden;
   background: #FFFFFF;
   box-shadow: 1px 1px 10px rgba(0,0,0,0.1);

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

@@ -604,6 +604,7 @@ export default {
       totalNo: 0,
       pageSizeNo: this.$store.getters.userInfo.configContent,
       product: new Map(),
+      hisListForm:{},
       listForm: {
         standNumber: "", //标准编号
         standName: "",//标准名称
@@ -663,6 +664,7 @@ export default {
     getFormFieldList (item) {
       console.log(item);
       this.$nextTick(() => {
+        this.hisListForm =  JSON.parse(JSON.stringify(item))
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
@@ -929,11 +931,12 @@ export default {
                       type: "5",
                       json: {
                         taskInfo: "选择已拆分标准",
-                        form: this.listForm,
+                        form: this.hisListForm,
                         roleForm: this.roleForm,
                         commentText: this.commentText
                       }
                     };
+                    let json = this.hisListForm
                     this.$http.post("lawss/activiti/completeTaskNew", {
                       taskIds: this.$route.query.taskIds,
                       userId: this.$store.getters.userInfo.userId,

src/pages/processCenter/pages/creatProcess/bzpg/step2.vue

@@ -280,6 +280,7 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum

src/pages/processCenter/pages/creatProcess/bzpg/step3.vue

@@ -439,24 +439,45 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
-        this.listForm = JSON.parse(JSON.stringify(item));
+        if(!item.form){
-        this.listForm.prcNum = this.prcNum;
+          this.listForm = JSON.parse(JSON.stringify(item));
-        this.listForm.prcName = this.prcName;
+          this.listForm.prcNum = this.prcNum;
-        this.listForm["id"] = item.id;
+          this.listForm.prcName = this.prcName;
-        this.projectGroup = item.dataList[0].projectGroup;
+          this.listForm["id"] = item.id;
-        this.$http.get('SarStandItems/sar-stand-items/findAllItems', {
+          this.projectGroup = item.dataList[0].projectGroup;
-          ids: item.standId,
+          this.$http.get('SarStandItems/sar-stand-items/findAllItems', {
-          type: item.fileType
+            ids: item.standId,
-        },{
+            type: item.fileType
-          _this: this
+          },{
-        }, res => {
+            _this: this
-           this.breakdownList = res.data
+          }, res => {
-           this.breakdownList.map(item => {
+            this.breakdownList = res.data
-            delete item.termsConditions
+            this.breakdownList.map(item => {
+              delete item.termsConditions
+            })
           })
-        })
+          this.getProductData();
-        this.getProductData();
+        }else{
+          this.listForm = JSON.parse(JSON.stringify(item.form));
+          this.commentText = item.commentText
+          this.dataList = item.dataList
+          this.projectGroup = item.dataList[0].projectGroup;
+          this.$http.get('SarStandItems/sar-stand-items/findAllItems', {
+            ids: item.form.standId,
+            type: item.form.fileType
+          },{
+            _this: this
+          }, res => {
+            this.breakdownList = res.data
+            this.breakdownList.map(item => {
+              delete item.termsConditions
+            })
+          })
+          this.getProductData();
+        }
+
       });
     },
     choiceZRRS(row, type, index) {
@@ -641,13 +662,14 @@ export default {
     //保存
     handleSave() {
       this.saveLoading = true;
-      this.listForm.dataList = this.dataList;
+      // this.listForm.dataList = this.dataList;
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
       _formData.append("prcType", "5");
       _formData.append("taskIds", this.taskIds);
       _formData.append("json", JSON.stringify({
         form: this.listForm,
+        dataList: this.dataList,
         commentText: this.commentText
       }));
       saveTaskForPub(_formData).then(res => {

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

@@ -285,7 +285,6 @@
         <el-table-column
           prop="planCloseTime"
           width="150"
-          sortable="custom"
           label="计划关闭时间">
           <template slot-scope="scope">
             {{ (scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11) : "") }}
@@ -294,7 +293,6 @@
       </el-table>
       <pagination
         style="position: relative;"
-        :page="queryUnqualidiedData.pageNo"
         :total="total"
         @pageChange="pageChange"
         @pageSizeChange="pageSizeChange"/>