标准征求意见页面调整

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

@@ -24,12 +24,10 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="选择征求意见" class="add-form-item form-item-disabled">
+                <el-form-item label="标准号/名称" prop="cid" class="add-form-item form-item-disabled">
-                  <div class="addButton">
+                  <div class="addButton" style="padding-left: 10px">
                     <el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button>
                   </div>
-                </el-form-item>
-                <el-form-item label="标准号" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -37,14 +35,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="form.cname"
-                    placeholder="请输入标准名称"
-                    clearable
-                  ></el-input>
-                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     v-model="form.endTime"
@@ -52,12 +42,10 @@
                     placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
-                <el-form-item label="选择标准附件" class="add-form-item form-item-disabled">
+                <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
-                  <div class="addButton">
+                  <div class="addButton" style="padding-left: 10px">
                     <el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
                   </div>
-                </el-form-item>
-                <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
                   <el-input
                     v-model="form.fjListId"
                     style="display: none;"
@@ -519,15 +507,6 @@ export default {
         this.total = res.data.count
         this.spinShow = false
       })
-      // var form = this.standCommonlySearch
-      // this.$http.get('slrs/sar-public-idea/SelectAllPage', form, {
-      //   _this: this
-      // }, res => {
-      //   this.standInfoList = res.data.records
-      //   this.total = res.data.total
-      //   this.spinShow = false
-      // }, e => {
-      // })
     },
     pageChange(page) {
       this.standCommonlySearch.page = page
@@ -561,11 +540,10 @@ export default {
           bringData.push(deposit.get(this.selectedList[i]));
         }
         if (bringData[0].standYear) {
-          this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear
+          this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + ' ' + bringData[0].standName
         } else {
-          this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
+          this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName
         }
-        this.form.cname = bringData[0].standName;
         this.listModel = false;
       } else if (this.selectedList.length > 1) {
         this.$message.warning("只能选择一条数据进行带入");
@@ -680,6 +658,9 @@ export default {
     }
   }
 
+  .el-input__icon {
+    width: 15px;
+  }
   position: relative;
   height: 100%;
 

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

@@ -24,26 +24,16 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="选择征求意见" class="add-form-item form-item-disabled">
+                <el-form-item label="标准号/名称" prop="cid" class="add-form-item form-item-disabled">
-                  <div class="addButton">
+                  <div class="addButton" style="padding-left: 10px">
                     <el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button>
                   </div>
-                </el-form-item>
-                <el-form-item label="标准号" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
                     placeholder="请输入标准编号"
                     clearable
-                  ></el-input>
+                  />
-                </el-form-item>
-                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                  <el-input
-                          disabled
-                          v-model="form.cname"
-                          placeholder="请输入标准名称"
-                          clearable
-                  ></el-input>
                 </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
@@ -52,18 +42,18 @@
                     placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
-                <el-form-item label="选择标准附件" class="add-form-item form-item-disabled">
+                <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
-                  <div class="addButton">
+                  <div class="addButton" style="padding-left: 10px">
                     <el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
                   </div>
-                </el-form-item>
-                <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
                   <el-input
                     v-model="form.fjListId"
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      {{ item.fileName }}
+                    </div>
                   </div>
                 </el-form-item>
               </el-col>
@@ -195,7 +185,8 @@
                   </el-formItem>
                   <el-formItem label="标准类别" prop="standSort" class="search-item">
                     <el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>
-                      <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}
+                      <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
+                        {{ opt.label }}
                       </el-option>
                     </el-select>
                   </el-formItem>
@@ -211,11 +202,13 @@
                       size="mini"
                       class="common-button-primary"
 
-                            @click="sarStandCompareHisInfo">查询</el-button>
+                      @click="sarStandCompareHisInfo">查询
+                    </el-button>
                     <el-button
                       class="common-button-default"
                       size="mini"
-                            @click="clearSearchStand">清空</el-button>
+                      @click="clearSearchStand">清空
+                    </el-button>
                   </el-formItem>
                 </el-form>
               </div>
@@ -235,8 +228,12 @@
                 <el-table-column type="selection" width="55" align="center"/>
                 <el-table-column label="标准号" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.standYear" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
+                    <div v-if="scope.row.standYear" @click="handlePreview(scope.row)" class="table-jump">
-                    <div v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
+                      {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
+                    </div>
+                    <div v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                      {{ scope.row.standNumber }}
+                    </div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="cname" label="标准名称" align="center">
@@ -344,9 +341,6 @@ export default {
         endTime: [
           {required: true, message: '请输入标准结束日期', trigger: 'change'},
         ],
-        cname: [
-          { required: true, message: '请输入标准名称', trigger: 'change' },
-        ],
         fjListId: [
           {required: true, message: '请选择附件', trigger: 'change'},
         ]
@@ -508,15 +502,6 @@ export default {
         this.total = res.data.count
         this.spinShow = false
       })
-      // var form = this.standCommonlySearch
-      // this.$http.get('slrs/sar-public-idea/SelectAllPage', form, {
-      //   _this: this
-      // }, res => {
-      //   this.standInfoList = res.data.records
-      //   this.total = res.data.total
-      //   this.spinShow = false
-      // }, e => {
-      // })
     },
     pageChange(page) {
       this.standCommonlySearch.page = page
@@ -550,13 +535,12 @@ export default {
           bringData.push(deposit.get(this.selectedList[i]));
         }
         if (bringData[0].standYear) {
-          this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear
+          this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + ' ' + bringData[0].standName
         } else {
-          this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
+          this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName
         }
         this.form.standType = bringData[0].standType
         this.form.standId = bringData[0].id
-        this.form.cname = bringData[0].standName;
         this.listModel = false;
       } else if (this.selectedList.length > 1) {
         this.$message.warning("只能选择一条数据进行带入");
@@ -678,20 +662,27 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 @import '~@/assets/styles/mixins';
+
 .bzzqyjStep1 {
   .myForm {
     /deep/ .el-form-item__content {
       line-height: 10px;
     }
   }
+
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
+  .el-input__icon {
+    width: 15px;
+  }
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -699,6 +690,7 @@ export default {
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -706,12 +698,14 @@ export default {
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
@@ -719,33 +713,41 @@ export default {
     height: calc(~'100% - 107px');
     overflow: auto;
   }
+
   .standardForComments {
     height: 100%;
     background: #fff;
+
     .el-divider--horizontal {
       display: block;
       height: 1px;
       width: 100%;
       margin: 0;
     }
+
     flex-direction: column;
+
     .action-bar {
       margin-bottom: 5px;
       padding: 0;
     }
+
     .content {
       flex: auto;
       overflow: hidden;
       display: flex;
       flex-direction: column;
+
       .table-wrap {
         flex: auto;
         overflow: hidden;
         position: relative;
       }
     }
+
     & > .pagination {
       position: static;
+
       /deep/ .pagination-slot {
         padding: 0;
       }

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

@@ -24,7 +24,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -32,14 +32,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="form.cname"
-                    placeholder="请输入标准名称"
-                    clearable
-                  ></el-input>
-                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
@@ -54,7 +46,7 @@
                           style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
                   </div>
                 </el-form-item>
                 <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">

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

@@ -24,7 +24,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -32,14 +32,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.cname"
-                                            placeholder="请输入标准名称"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
@@ -54,7 +46,9 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                                        <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      {{ item.fileName }}
+                    </div>
                   </div>
                 </el-form-item>
               </el-col>
@@ -68,11 +62,13 @@
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="addModal"
-                               size="mini">新增</el-button>
+                     size="mini">新增
+          </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="addDelete"
-                               size="mini">删除</el-button>
+                     size="mini">删除
+          </el-button>
         </div>
         <el-table
           ref="multipleTable"
@@ -293,7 +289,8 @@
         prcNum: this.$route.query.prcNum,
       }, {}, res => {
         this.histortData = res
-                }, e => {})
+      }, e => {
+      })
     },
     handleSelectionChange(val) {
       this.idList = []
@@ -396,6 +393,7 @@
           var json = this.json
           json.commentText = this.commentText
           json.info = this.data
+          json.form = this.form
           json.department = this.$store.getters.userInfo.orgName
           this.$http.post('lawss/activiti/completeTask', {
             json: JSON.stringify(json),
@@ -439,6 +437,7 @@
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzdyStep3 {
   /deep/ .el-drawer__container {
     .prc-content-border {
@@ -446,14 +445,21 @@
       padding: 0 20px 0;
     }
   }
+
   .fileClass {
     cursor: pointer;
   }
+
   .fileClass:hover {
     color: #0c91e5;
   }
+
+  .el-input__icon {
+    width: 15px;
+  }
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -461,6 +467,7 @@
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -468,18 +475,21 @@
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -487,6 +497,7 @@
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;

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

@@ -24,7 +24,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -32,14 +32,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.cname"
-                                            placeholder="请输入标准名称"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
@@ -54,7 +46,9 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                                        <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      {{ item.fileName }}
+                    </div>
                   </div>
                 </el-form-item>
               </el-col>
@@ -272,12 +266,14 @@
         prcNum: this.$route.query.prcNum,
       }, {}, res => {
         this.histortData = res
-                }, e => {})
+      }, e => {
+      })
     },
     handleTabs(name) {
       this.active = name
     },
-            handleSave() {},
+    handleSave() {
+    },
     handleSubmit() {
       this.isSubmit = true
       var json = this.json
@@ -343,6 +339,7 @@
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzdyStep4 {
   /deep/ .el-drawer__container {
     .prc-content-border {
@@ -350,14 +347,18 @@
       padding: 0 20px 0;
     }
   }
+
   .fileClass {
     cursor: pointer;
   }
+
   .fileClass:hover {
     color: #0c91e5;
   }
+
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -365,6 +366,7 @@
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -372,18 +374,21 @@
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -391,6 +396,7 @@
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;

src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue

@@ -24,7 +24,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -32,14 +32,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="form.cname"
-                    placeholder="请输入标准名称"
-                    clearable
-                  ></el-input>
-                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
@@ -54,7 +46,9 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      {{ item.fileName }}
+                    </div>
                   </div>
                 </el-form-item>
               </el-col>
@@ -410,7 +404,7 @@ export default {
             item.type = false;
           });
           this.json = data;
-          this.data = data.summaryList
+          this.data = data.info
           if (data.introduce) {
           } else {
             this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {

src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue

@@ -24,7 +24,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -32,14 +32,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="form.cname"
-                    placeholder="请输入标准名称"
-                    clearable
-                  ></el-input>
-                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
@@ -54,7 +46,9 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      {{ item.fileName }}
+                    </div>
                   </div>
                 </el-form-item>
               </el-col>
@@ -387,13 +381,14 @@ export default {
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg);
-          this.form.cid = data.cid
+          this.form.fjList = data.fjList || data.form.fjList
-          this.form.endTime = data.endTime
+          this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.cname = data.cname
+          this.form.cid = data.cid || data.form.cid;
-          this.form.fjList = data.fjList
+          this.form.endTime = data.endTime || data.form.endTime;
-          this.form.fjListId = data.fjListId
+          this.form.cname = data.cname || data.form.cname;
+          this.oldData = JSON.parse(JSON.stringify(data.info))
           var arr = []
-          data.summaryList.forEach( item => {
+          data.info.forEach(item => {
             if (item.state != '3') {
               arr.push(item)
             }

src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue

@@ -24,7 +24,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -32,14 +32,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.cname"
-                                            placeholder="请输入标准名称"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
@@ -54,7 +46,9 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                                        <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      {{ item.fileName }}
+                    </div>
                   </div>
                 </el-form-item>
               </el-col>
@@ -68,11 +62,13 @@
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(data, '汇总单.xls')"
-                               size="mini">导出汇总单</el-button>
+                     size="mini">导出汇总单
+          </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(oldData, '征求意见搞.xls')"
-                               size="mini">导出征求意见搞</el-button>
+                     size="mini">导出征求意见搞
+          </el-button>
         </div>
         <el-table
           ref="multipleTable"
@@ -290,7 +286,8 @@
         prcNum: this.$route.query.prcNum,
       }, {}, res => {
         this.histortData = res
-                }, e => {})
+      }, e => {
+      })
     },
     upload(row, title) {
       var params = {
@@ -314,7 +311,8 @@
           item.stateText = '不上报'
         }
       })
-                this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
+      this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {
+      })
     },
     stateText(row) {
       if (row === '1') {
@@ -326,7 +324,8 @@
     handleTabs(name) {
       this.active = name
     },
-            handleSave() {},
+    handleSave() {
+    },
     handleSubmit() {
       if (this.data.length < 1) {
         this.$message.warning('请输入征求意见搞')
@@ -376,13 +375,14 @@
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
-                        this.form.cid = data.cid
+          this.form.fjList = data.fjList || data.form.fjList
-                        this.form.endTime = data.endTime
+          this.form.fjListId = data.fjListId || data.form.fjListId
-                        this.form.cname = data.cname
+          this.form.cid = data.cid || data.form.cid;
-                        this.form.fjList = data.fjList
+          this.form.endTime = data.endTime || data.form.endTime;
-                        this.form.fjListId = data.fjListId
+          this.form.cname = data.cname || data.form.cname;
+          this.oldData = JSON.parse(JSON.stringify(data.info))
           var arr = []
-                        data.summaryList.forEach( item => {
+          data.info.forEach(item => {
             if (item.state != '3') {
               arr.push(item)
             }
@@ -403,6 +403,7 @@
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzdyStep7 {
   /deep/ .el-drawer__container {
     .prc-content-border {
@@ -410,14 +411,18 @@
       padding: 0 20px 0;
     }
   }
+
   .fileClass {
     cursor: pointer;
   }
+
   .fileClass:hover {
     color: #0c91e5;
   }
+
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -425,6 +430,7 @@
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -432,18 +438,21 @@
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -451,6 +460,7 @@
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;

src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue

@@ -24,7 +24,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -32,14 +32,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.cname"
-                                            placeholder="请输入标准名称"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
@@ -54,7 +46,9 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                                        <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      {{ item.fileName }}
+                    </div>
                   </div>
                 </el-form-item>
               </el-col>
@@ -68,11 +62,13 @@
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(data, '汇总单.xls')"
-                               size="mini">导出汇总单</el-button>
+                     size="mini">导出汇总单
+          </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(oldData, '征求意见搞.xls')"
-                               size="mini">导出征求意见搞</el-button>
+                     size="mini">导出征求意见搞
+          </el-button>
         </div>
         <el-table
           ref="multipleTable"
@@ -290,7 +286,8 @@
         prcNum: this.$route.query.prcNum,
       }, {}, res => {
         this.histortData = res
-                }, e => {})
+      }, e => {
+      })
     },
     upload(row, title) {
       var params = {
@@ -314,7 +311,8 @@
           item.stateText = '不上报'
         }
       })
-                this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
+      this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {
+      })
     },
     stateText(row) {
       if (row === '1') {
@@ -326,7 +324,8 @@
     handleTabs(name) {
       this.active = name
     },
-            handleSave() {},
+    handleSave() {
+    },
     handleSubmit() {
       if (this.data.length < 1) {
         this.$message.warning('请输入征求意见搞')
@@ -376,13 +375,14 @@
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
-                        this.form.cid = data.cid
+          this.form.fjList = data.fjList || data.form.fjList
-                        this.form.endTime = data.endTime
+          this.form.fjListId = data.fjListId || data.form.fjListId
-                        this.form.cname = data.cname
+          this.form.cid = data.cid || data.form.cid;
-                        this.form.fjList = data.fjList
+          this.form.endTime = data.endTime || data.form.endTime;
-                        this.form.fjListId = data.fjListId
+          this.form.cname = data.cname || data.form.cname;
+          this.oldData = JSON.parse(JSON.stringify(data.info))
           var arr = []
-                        data.summaryList.forEach( item => {
+          data.info.forEach(item => {
             if (item.state != '3') {
               arr.push(item)
             }
@@ -404,6 +404,7 @@
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzdyStep8 {
   /deep/ .el-drawer__container {
     .prc-content-border {
@@ -411,14 +412,18 @@
       padding: 0 20px 0;
     }
   }
+
   .fileClass {
     cursor: pointer;
   }
+
   .fileClass:hover {
     color: #0c91e5;
   }
+
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -426,6 +431,7 @@
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -433,18 +439,21 @@
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -452,6 +461,7 @@
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;

src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue

@@ -24,7 +24,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -32,14 +32,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="form.cname"
-                    placeholder="请输入标准名称"
-                    clearable
-                  ></el-input>
-                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
@@ -54,7 +46,9 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      {{ item.fileName }}
+                    </div>
                   </div>
                 </el-form-item>
               </el-col>
@@ -381,13 +375,14 @@ export default {
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
-          this.form.cid = data.cid
+          this.form.fjList = data.fjList || data.form.fjList
-          this.form.endTime = data.endTime
+          this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.cname = data.cname
+          this.form.cid = data.cid || data.form.cid;
-          this.form.fjList = data.fjList
+          this.form.endTime = data.endTime || data.form.endTime;
-          this.form.fjListId = data.fjListId
+          this.form.cname = data.cname || data.form.cname;
+          this.oldData = JSON.parse(JSON.stringify(data.info))
           var arr = []
-          data.summaryList.forEach( item => {
+          data.info.forEach(item => {
             if (item.state != '3') {
               arr.push(item)
             }