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

# Conflicts:
#	src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

src/pages/processCenter/pages/components/ProcessMixin.vue

@@ -9,13 +9,33 @@ export default {
       return {
           processTypeList: [
               {
-                  label: '标准入库流程',
+                  label: '标准调研流程',
+                  value: '2'
+              },
+              {
+                  label:'标准入库流程',
                   value: '1'
               },
-            {
-              label:'标准清单发布流程',
-              value: '3'
-            },
+              {
+                  label:'标准征求意见流程',
+                  value: '3'
+              },
+              {
+                  label:'标准清单发布/更新流程',
+                  value: '6'
+              },
+              {
+                  label: '项目合规评估流程',
+                  value: '7'
+              },
+              {
+                  label: '未符合项整改流程',
+                  value: '8'
+              },
+              {
+                  label: '标准解读流程',
+                  value: '9'
+              },
           ],
           formDisableFlag: false,
           pickerOptions: {

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

@@ -343,11 +343,11 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+      if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
         return true
       } else {
         this.spinShow = false
-        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+        this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
         return false
       }
       // 判断文件上传大小
@@ -441,11 +441,12 @@ export default {
                       this.$message.success('流程发起成功')
                       this.$router.push('/processCenter')
                     }
+                    this.isSubmit = false
                   })
                 } else {
+                  this.isSubmit = false
                   this.$message.warning('流程启动失败')
                 }
-                this.isSubmit = false
               })
             } else {
               return this.$message.warning('请完善人员信息')

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

@@ -169,11 +169,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -193,11 +193,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -191,11 +191,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -191,11 +191,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -191,11 +191,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -191,11 +191,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -577,6 +577,51 @@
       <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="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                                            <el-form-item label="类型" class="search-item search-item-last">
+                                              <el-select
+                                                @change="typeChange"
+                                                v-model="standardSearch.standType"
+                                                placeholder="请选择"
+                                                filterable
+                                              >
+                                                <el-option
+                                                  v-for="item in standardTypeOptions"
+                                                  :value="item.value"
+                                                  :key="item.value"
+                                                  :label="item.label"
+                                                >
+                                                </el-option>
+                                              </el-select>
+                                            </el-form-item>
+                            <el-form-item label="标准号/标准名称" class="search-item search-item-last">
+                              <el-input
+                                v-model="standardSearch.standNumber"
+                                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="'072efe80c5459dd47fedd2d14f59ff7f'"
+                                @click="addList">
+                                查询
+                              </el-button>
+                            </el-form-item>
+                            <el-form-item class="search-item btn-box">
+                              <el-button
+                                class="common-button-default"
+                                size="small"
+                                v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                                @click="clearSearch">清空
+                              </el-button>
+                            </el-form-item>
+                          </el-form>
+                        </div>
             <el-table
               :data="standardData"
               tooltip-effect="dark"
@@ -729,13 +774,20 @@ export default {
       fileUrl: 'api/att/attFile/upload',
       fileMadel: false,
       searching: false,
-      // 查询相关参数
+      // 查询选择清单相关参数
       sarSarAccessEOSearch: {
         countryArea: "",
         detailedListName: "",
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent
       },
+      //查询添加标准相关数据
+      standardSearch: {
+        standType: '',
+        standNumber:'',
+        pageNo: 1,
+        pageSizeNo: this.$store.getters.userInfo.configContent
+    },
       standList: [], //新添加的标准
       modalshowflag: false, // drawer开关
       drawerTitle: "", //drawer标题
@@ -823,6 +875,18 @@ export default {
       },
       choiceForm: {}, //选择标准清单列表
       countryOptions: [], //适用区域下拉框数据
+      standardTypeOptions: [
+        {
+          value: 'INLAND',
+        label: '国内标准法规',
+        item:'INLAND',
+      },
+        {
+          value: 'FOREIGN',
+          label: '海外标准法规',
+          item:'FOREIGN',
+        },
+      ],
       user1: "",
       user2: "",
       user3: "",
@@ -878,7 +942,6 @@ export default {
     // //判断当前选中的是哪个清单
     selectionList(type) {
       type  = this.listType
-      console.log(type);
       if (type === "project") {
         this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
           page: this.page,
@@ -925,11 +988,18 @@ export default {
         countryArea: "",
         detailedListName: ""
       };
+      this.standardSearch ={
+        standType:'',
+        standNumber: '',
+      }
       this.selectionList();
+      this.addList()
     },
     //点击添加事件
     addList() {
       this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+        standType: this.standardSearch.standType,
+        standNumber: this.standardSearch.standNumber,
         page: this.pageNo,
         pageSize: this.pageSizeNo
       }, {
@@ -1126,6 +1196,9 @@ export default {
     closeDrawer() {
       this.ListModel = false;
     },
+    typeChange(type) {
+      this.standardSearch.standType = type
+    },
     //添加标准取消事件
     cancelStand() {
       this.standModel = false;

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

@@ -135,46 +135,6 @@
         </el-collapse>
       </div>
     </div>
-    <div class="content" v-show="active == '2'">
-      <div class="block" style="padding-top: 20px;">
-        <el-timeline>
-          <el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>标准/政策法规工程师</h4>
-              <div style="margin-top: 10px;">
-                <el-input v-model="user1" placeholder="请输入"></el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="选择责任人进行会签" placement="top" :color="user2 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>责任人</h4>
-              <div style="margin-top: 10px;">
-                <el-input v-model="user2" placeholder="请输入">
-
-                </el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="根据会签内容进行修订" placement="top" :color="user3 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>标准/政策法规工程师</h4>
-              <div style="margin-top: 10px;">
-                <el-input v-model="user3" placeholder="请输入"></el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="审核" placement="top" :color="user5 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>业务经理</h4>
-              <div style="margin-top: 10px;">
-                <el-input v-model="user5" placeholder="请输入"></el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list">
         <el-table
@@ -197,14 +157,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column

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

@@ -161,14 +161,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column

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

@@ -158,14 +158,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column

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

@@ -1335,6 +1335,7 @@
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
+                wssmrOptions: [], // 我司署名人
                 sycpxOptions: [], // 适用产品线
                 zrbmOptions: [], // 责任部门
                 zrgcsOptions: [], // 责任工程师
@@ -2024,6 +2025,7 @@
                 this.categoryOptions = res.data.NYLXCLASS // 能源类型
                 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
                 this.cysdOptions = res.data.WSCYSD // 我司参与深度
+                this.wssmrOptions = res.data.WSSMR // 我司署名人
                 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师

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

@@ -361,12 +361,15 @@
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.qcdw"
-                                            placeholder="请选择起草单位"
-                                            clearable
-                                    ></el-input>
+                                    <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
+                                        <el-option
+                                                v-for="item in qcdwOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
@@ -437,8 +440,13 @@
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
-                                        <el-option label="署名人1" value="1"></el-option>
-                                        <el-option label="署名人2" value="2"></el-option>
+                                        <el-option
+                                                v-for="item in wssmrOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -811,6 +819,8 @@
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
+                wssmrOptions: [], // 我司署名人
+                qcdwOptions: [], // 起草单位
                 sycpxOptions: [], // 适用产品线
                 zrbmOptions: [], // 责任部门
                 zrgcsOptions: [], // 责任工程师
@@ -1006,6 +1016,8 @@
                 this.categoryOptions = res.data.NYLXCLASS // 能源类型
                 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
                 this.cysdOptions = res.data.WSCYSD // 我司参与深度
+                this.wssmrOptions = res.data.WSSMR // 我司署名人
+                this.qcdwOptions = res.data.QCDW // 起草单位
                 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师

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

@@ -354,12 +354,15 @@
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                  <el-input
-                      disabled
-                      v-model="form.qcdw"
-                      placeholder="请选择起草单位"
-                      clearable
-                  ></el-input>
+                    <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
+                        <el-option
+                                v-for="item in qcdwOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                   <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
@@ -430,8 +433,13 @@
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
-                    <el-option label="署名人1" value="1"></el-option>
-                    <el-option label="署名人2" value="2"></el-option>
+                      <el-option
+                              v-for="item in wssmrOptions"
+                              placeholder="请选择"
+                              :key="item.value"
+                              :value="item.value"
+                              :label="item.label"
+                      ></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -803,6 +811,8 @@ export default {
       categoryOptions: [], // 能源类型
       applyAuthOptions: [], // 适用认证
       cysdOptions: [], // 我司参与深度
+      wssmrOptions: [], // 我司署名人
+      qcdwOptions: [], // 起草单位
       sycpxOptions: [], // 适用产品线
       zrbmOptions: [], // 责任部门
       zrgcsOptions: [], // 责任工程师
@@ -994,6 +1004,8 @@ export default {
       this.categoryOptions = res.data.NYLXCLASS // 能源类型
       this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
       this.cysdOptions = res.data.WSCYSD // 我司参与深度
+      this.wssmrOptions = res.data.WSSMR // 我司署名人
+      this.qcdwOptions = res.data.QCDW // 起草单位
       this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师

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

@@ -519,11 +519,15 @@
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                  <el-input
-                      v-model="form.qcdw"
-                      placeholder="请选择起草单位"
-                      clearable
-                  ></el-input>
+                    <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
+                        <el-option
+                                v-for="item in qcdwOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                   <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
@@ -594,8 +598,13 @@
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
-                    <el-option label="署名人1" value="1"></el-option>
-                    <el-option label="署名人2" value="2"></el-option>
+                      <el-option
+                              v-for="item in wssmrOptions"
+                              placeholder="请选择"
+                              :key="item.value"
+                              :value="item.value"
+                              :label="item.label"
+                      ></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -1173,6 +1182,8 @@ export default {
       categoryOptions: [], // 能源类型
       applyAuthOptions: [], // 适用认证
       cysdOptions: [], // 我司参与深度
+      wssmrOptions: [], // 我司署名人
+      qcdwOptions: [], // 起草单位
       sycpxOptions: [], // 适用产品线
       zrbmOptions: [], // 责任部门
       zrgcsOptions: [], // 责任工程师
@@ -1602,6 +1613,8 @@ export default {
       this.categoryOptions = res.data.NYLXCLASS // 能源类型
       this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
       this.cysdOptions = res.data.WSCYSD // 我司参与深度
+      this.wssmrOptions = res.data.WSSMR // 我司署名人
+      this.qcdwOptions = res.data.QCDW // 起草单位
       this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师

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

@@ -26,7 +26,7 @@
               <el-col :span="24">
                 <el-form-item label="选择征求意见" class="add-form-item form-item-disabled">
                   <div class="addButton">
-                    <el-button  size="small" type="primary" @click="addZqyjList">选择征求意见</el-button>
+                    <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">
@@ -164,46 +164,46 @@
     >
     </ProcessFooter>
     <el-drawer
-      title="标准征求意见数据库"
+      title="标准库"
       :visible.sync="listModel"
       size="900px"
       custom-class="demo-drawer"
     >
       <div class="standardForComments">
-
         <div class="content">
           <!-- 顶部工具栏 -->
           <table-tools-bar>
             <div slot="left">
               <div class="search-area">
-<!--                <el-form :model="standCommonlySearch" inline class="label-input-form">-->
-<!--&lt;!&ndash;                  <el-formItem label="类别" class="search-item">&ndash;&gt;-->
-<!--&lt;!&ndash;                    <el-input v-model="standCommonlySearch.categorg" class="s-c-input" placeholder="标准/政策" clearable :maxlength="100"></el-input>&ndash;&gt;-->
-<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
-<!--&lt;!&ndash;                  <el-formItem label="关键字" class="search-item">&ndash;&gt;-->
-<!--&lt;!&ndash;                    <el-input v-model="standCommonlySearch.cname" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100"></el-input>&ndash;&gt;-->
-<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
-<!--&lt;!&ndash;                  <el-formItem label="开始日期" class="search-item">&ndash;&gt;-->
-<!--&lt;!&ndash;                    <el-datePicker v-model="standCommonlySearch.start" :editable="false"&ndash;&gt;-->
-<!--&lt;!&ndash;                                   placeholder="请选择开始日期"></el-datePicker>&ndash;&gt;-->
-<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
-<!--&lt;!&ndash;                  <el-formItem label="结束日期" class="search-item">&ndash;&gt;-->
-<!--&lt;!&ndash;                    <el-datePicker v-model="standCommonlySearch.end" :editable="false"&ndash;&gt;-->
-<!--&lt;!&ndash;                                   placeholder="请选择结束日期"></el-datePicker>&ndash;&gt;-->
-<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
-<!--                  <el-formItem class="search-item btn-box">-->
-<!--                    <el-button-->
-<!--                            type="primary"-->
-<!--                            size="mini"-->
-<!--                            class="common-button-primary"-->
+                <el-form :model="standCommonlySearch" inline class="label-input-form">
+                  <el-formItem label="标准号/名称" prop="standNumber" class="search-item">
+                    <el-input v-model="standCommonlySearch.standNumber" placeholder="根据标准号/名称查找" clearable/>
+                  </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>
+                    </el-select>
+                  </el-formItem>
+                  <el-formItem label="标准来源" prop="standType" class="search-item">
+                    <el-select v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
+                      <el-option value="INLAND" key="1" label="国内标准"></el-option>
+                      <el-option value="FOREIGN" key="2" label="海外标准"></el-option>
+                    </el-select>
+                  </el-formItem>
+                  <el-formItem class="search-item btn-box">
+                    <el-button
+                            type="primary"
+                            size="mini"
+                            class="common-button-primary"
 
-<!--                            @click="sarStandCompareHisInfo">查询</el-button>-->
-<!--                    <el-button-->
-<!--                            class="common-button-default"-->
-<!--                            size="mini"-->
-<!--                            @click="clearSearchStand">清空</el-button>-->
-<!--                  </el-formItem>-->
-<!--                </el-form>-->
+                            @click="sarStandCompareHisInfo">查询</el-button>
+                    <el-button
+                            class="common-button-default"
+                            size="mini"
+                            @click="clearSearchStand">清空</el-button>
+                  </el-formItem>
+                </el-form>
               </div>
             </div>
           </table-tools-bar>
@@ -332,10 +332,9 @@ export default {
       },
       // 标准征求意见数据可库
       standCommonlySearch: {
-        // categorg: '',
-        // cname: '',
-        // start: '',
-        // end: '',
+        standSort: '',
+        standNumber: '',
+        standType: '',
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent
       },
@@ -383,6 +382,7 @@ export default {
         label: 'name'
       },
       roleRow: {},
+      standSortOptions: [],
     }
   },
   components: {
@@ -393,6 +393,12 @@ export default {
   mounted () {
     this.getTree()
     this.sarStandCompareHis()
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this
+    }, res => {
+      this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+    }, e => {
+    })
     this.tableHeight = $('.content').height() - 44
     window.onresize = () => {
       this.tableHeight = $('.content').height() - 44
@@ -408,15 +414,14 @@ export default {
     // 清空
     clearSearchStand () {
       this.standCommonlySearch.page = 1
-      this.standCommonlySearch.start = ''
-      this.standCommonlySearch.end = ''
-      this.standCommonlySearch.categorg = ''
-      this.standCommonlySearch.cname = ''
+      this.standCommonlySearch.standSort = ''
+      this.standCommonlySearch.standNumber = ''
+      this.standCommonlySearch.standType = ''
       this.sarStandCompareHis()
     },
     // 搜索
     sarStandCompareHisInfo() {
-      this.splitInfoPage = 1
+      this.standCommonlySearch.page = 1
       this.sarStandCompareHis()
     },
     // 查询表格

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

@@ -234,7 +234,7 @@
             handleSave() {},
             handleSubmit() {
                 if (this.data.length < 1) {
-                    this.$message.warning('请输入征求意见搞')
+                    this.$message.warning('请输入征求意见')
                 } else {
                     var a = 0
                     var b = 0

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

@@ -209,9 +209,6 @@
                     return '处理后上报'
                 }
             },
-            upload (row) {
-                console.log(row);
-            },
             handleTabs(name) {
                 this.active = name
             },

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

@@ -209,9 +209,6 @@
                     return '处理后上报'
                 }
             },
-            upload (row) {
-                console.log(row);
-            },
             handleTabs(name) {
                 this.active = name
             },

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

@@ -209,9 +209,6 @@
                     return '处理后上报'
                 }
             },
-            upload (row) {
-                console.log(row);
-            },
             handleTabs(name) {
                 this.active = name
             },

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

@@ -340,7 +340,7 @@ export default {
 
     // 点击批量删除事件
     deleteList() {
-      if (this.selectList.length < 1) {
+      if (this.selectedList.length < 1) {
         this.$message.warning("请选择一条数据进行删除");
       } else {
         this.$confirm("您确认删除这些数据?", "提示", {
@@ -350,7 +350,7 @@ export default {
           type: "warning"
         }).then(() => {
           let exits = [];
-          this.selectList.map(item => {
+          this.selectedList.map(item => {
             let index;
             index = this.dataList.findIndex(items => {
               return items.id = item;
@@ -360,7 +360,7 @@ export default {
             }
             exits.push(item);
           });
-          this.selectList = [];
+          this.selectedList = [];
         }).catch(() => {
         });
       }

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

@@ -92,8 +92,10 @@
           <el-table-column prop="planCloseTime" label="整改完成时间"/>
           <el-table-column prop="responsibleUnit" label="责任部门"/>
           <el-table-column prop="dutyEngineer" label="负责人"/>
-          <el-table-column label="佐证材料">
-            <div class="div-text">{{ 11 || '暂无数据' }}</div>
+          <el-table-column label="佐证材料" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <el-button  type="text" @click="download" >{{scope.row.fileText}}</el-button>
+            </template>
           </el-table-column>
         </el-table>
         <!--        <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"/>-->
@@ -263,6 +265,16 @@ export default {
       }
       this.getData()
     },
+    download(row) {
+      // window.open(process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + tPath)
+      var name = row.fileText;
+      var url = row.fileTextPath;
+      const a = document.createElement('a')
+      a.setAttribute('download', name)
+      a.setAttribute('target', '_blank')
+      a.setAttribute('href', process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + url)
+      a.click()
+    },
     // 分页事件
     pageChange (page) {
       this.pageNo = page

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

@@ -65,7 +65,7 @@
         <div class="tableTitle">
           <div class="tableButton">
             <el-button plain class="common-button-primary" size="mini" @click="addList">新增</el-button>
-            <el-button plain class="common-button-primary" size="mini" @click="addList">批量删除</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
           </div>
         </div>
         <el-table
@@ -163,6 +163,51 @@
       <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="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="类型" class="search-item search-item-last">
+                  <el-select
+                    @change="typeChange"
+                    v-model="standardSearch.standType"
+                    placeholder="请选择"
+                    filterable
+                  >
+                    <el-option
+                      v-for="item in standardTypeOptions"
+                      :value="item.value"
+                      :key="item.value"
+                      :label="item.label"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="标准号/标准名称" class="search-item search-item-last">
+                  <el-input
+                    v-model="standardSearch.standName"
+                    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="'072efe80c5459dd47fedd2d14f59ff7f'"
+                    @click="getStandData">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                    @click="clearSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
             <el-table
               :data="sarAccessListDatas"
               tooltip-effect="dark"
@@ -344,6 +389,24 @@ export default {
       standList: [], //新添加的标准
       modalshowflag: false, // drawer开关
       drawerTitle: "", //drawer标题
+      // 查询相关参数
+      searching: false,
+      standardSearch: {
+        standType:'',
+        standName:'',
+      },
+      standardTypeOptions: [
+        {
+          value: 'INLAND',
+          label: '国内标准法规',
+          item:'INLAND',
+        },
+        {
+          value: 'FOREIGN',
+          label: '海外标准法规',
+          item:'FOREIGN',
+        },
+      ],
       nodeList: [],
       defaultProps: {
         children: "children",
@@ -386,6 +449,7 @@ export default {
       },
       ListModel: false, //选择拆分标准抽屉状态
       treeData: [], // 人员数据
+      selectList: [], //选择标准的选择框
       isSubmit: false,
       saveLoading: false,
       selectedList: [],  //拆分标准的选择框
@@ -409,7 +473,8 @@ export default {
           id: "",
           itemsName: "",
           itemsNum: "",
-          responsibleUnit: "",
+          responsibleUnit: "",  //责任部门
+          responsibleEngineer: "", //责任工程师
           standId: "",
           svpps: ""
         }],
@@ -477,6 +542,9 @@ export default {
     handleTabs(name) {
       this.active = name;
     },
+    typeChange(type) {
+      this.standardSearch.standType = type
+    },
     choiceShow() {
       this.ListModel = true;
     },
@@ -497,6 +565,31 @@ export default {
     addList() {
       this.standModel = true;
     },
+    // 点击批量删除事件
+    deleteList() {
+       if(this.selectList.length < 1){
+         this.$message.warning('请选择一条数据进行删除')
+       }else {
+          this.$confirm('您确认删除这些数据？', '提示', {
+            confirmButtonText: "确认",
+            confirmButtonClass: "common-button-primary",
+            cancelButtonText: "取消",
+            type: "warning"
+          }). then(() => {
+            this.selectList.map(item => {
+              let index;
+            index =  this.dataList.findIndex(items => {
+                return items.productLine = item
+              })
+              if (index > -1) {
+                this.dataList.splice(index, 1);
+              }
+            });
+            this.selectList = [];
+          }).catch(() => {
+          })
+       }
+    },
     //取消添加事件
     cancelStand() {
       this.standModel = false;
@@ -540,8 +633,8 @@ export default {
       json.prcCreateUser = this.$store.getters.userInfo.userId;
       json.prcCreateUserName = this.$store.getters.userInfo.account;
       json.standId = this.listForm.standId;
-      json.XCXSSRQ =  this.sarAccessListDatas[0].attrInfoMap.XCXSSRQ
-      json.ZCCSSRQ =  this.sarAccessListDatas[0].attrInfoMap.ZCCSSRQ
+      json.XCXSSRQ =  this.sarAccessListDatas[0].xcxssrqgj
+      json.ZCCSSRQ =  this.sarAccessListDatas[0].zccssrqgj
       this.$refs['listForm'].validate((valid) => {
         if (valid) {
           this.$refs['roleForm'].validate((valid) => {
@@ -590,6 +683,7 @@ export default {
         }, {
           _this: this
         }, res => {
+          console.log(res)
           this.listForm.breakdownList = res.data;
           this.ListModel = false;
         }, e => {
@@ -609,7 +703,7 @@ export default {
     selectStandChange(data) {
       this.selectList = [];
       for (let i = 0; i < data.length; i++) {
-        this.selectList.push(data[i].id);
+        this.selectList.push(data[i].productLine);
       }
     },
     //添加产品线select的改变
@@ -655,28 +749,34 @@ export default {
       }, {
         _this: this
       }, res => {
-        this.productData = res.data;
+        this.productData = res.data.records;
         this.totalNo = res.data.total;
       }, e => {
 
       });
     },
     //获取标准数据
-    getStandData() {
-      console.log(this.page);
-      console.log(this.pageSize);
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+    getStandData(){
+      this.$http.post('SarStandItems/sar-stand-items/findStand',{
         page: this.page,
-        pageSize: this.pageSize,
-      }, {
-        _this: this
+        size: this.pageSize,
+        ...this.standardSearch,
+      },{
+        _this: this,
       }, res => {
-        console.log(res.data);
-        this.sarAccessListDatas = res.data.list;
-        this.total = res.data.count;
+        this.sarAccessListDatas = res.records;
+        this.total = res.total
       }, e => {
-      });
-    }
+
+      })
+    },
+    clearSearch() {
+      this.standardSearch = {
+        standName: "",
+        standType:"",
+      };
+      this.getStandData();
+    },
   },
   computed: {},
   mounted() {

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

@@ -132,14 +132,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
@@ -243,7 +241,8 @@ export default {
           id: "",
           itemsName: "",
           itemsNum: "",
-          responsibleUnit: "",
+          responsibleUnit: "",  //责任部门
+          responsibleEngineer: "", //责任工程师
           standId: "",
           svpps: ""
         }],
@@ -318,6 +317,7 @@ export default {
      */
     getFormFieldList (item) {
       this.$nextTick(() => {
+        console.log(item.dataList)
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
@@ -325,6 +325,7 @@ export default {
         this.listForm.dataList = item.dataList
         this.dataList = item.dataList
         this.dataList.distributePerson = item.dataList[0].distributePerson
+        this.listForm.breakdownList = item.breakdownList
       })
     },
 
@@ -344,6 +345,7 @@ export default {
       this.listForm.standId = this.listForm.standId;
       this.listForm.passFlag = '1';
       this.listForm.signFlag = "";
+      this.listForm.breakdownList = this.listForm.breakdownList
       const json = JSON.stringify(this.listForm);
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,

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

@@ -101,11 +101,17 @@
             prop="xCXSSRQ"
             align="center"
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             align="center"
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             fixed="right"
@@ -177,14 +183,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
@@ -384,6 +388,8 @@ export default {
           this.listForm.breakdownList.push({
             itemsName: item.pepdtos[i].breakdownList[j].itemsName,
             itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
+            responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
+            responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit,
             productLine: item.pepdtos[i].sarStandProjectLibraries.productLine,
             projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber,
             projectName: item.pepdtos[i].sarStandProjectLibraries.projectName,
@@ -400,6 +406,7 @@ export default {
             zCCSSRQ:  item.pepdtos[i].zCCSSRQ,
           });
         }
+        console.log(item.pepdtos);
       }
     },
     saveUserInfo() {
@@ -442,7 +449,6 @@ export default {
       this.listForm.zrUserId = this.$store.getters.userInfo.userId;
       this.listForm.commentText = this.commentText;
       this.listForm.approvalOpinion = "";
-      this.listForm.standId = this.listForm.standId;
       this.listForm.signFlag = "";
       const json = JSON.stringify(this.listForm.breakdownList);
       this.$http.post("lawss/activiti/completeTask", {

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

@@ -107,12 +107,18 @@
             width="200"
             align="center"
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="productType"
@@ -286,14 +292,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
@@ -496,6 +500,10 @@ export default {
         this.listForm.standNumber = item.step3DTOS[0].standNumber
         this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
         this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
+        this.listForm.itemsName = item.step3DTOS[0].itemsName
+        this.listForm.itemNum = item.step3DTOS[0].itemNum
+        this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit
+        this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer
       })
     },
 
@@ -506,12 +514,8 @@ export default {
     //提交事件
     handleSubmit() {
       this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
-      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
-      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
       this.listForm.commentText = this.commentText;
       this.listForm.approvalOpinion = "";
-      this.listForm.standId = this.listForm.standId;
       this.listForm.signFlag = "";
       this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);

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

@@ -107,12 +107,18 @@
             width="200"
             align="center"
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="productType"
@@ -243,14 +249,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
@@ -428,13 +432,19 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
-      console.log(item.dataList);
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
         this.listForm['id'] = item.id
         this.dataList = item.dataList
+        this.listForm.standName = item.standName
+        this.listForm.standNumber = item.standNumber
+        this.listForm.qualityEngineer = item.qualityEngineer
+        this.listForm.certifiedEngineer = item.certifiedEngineer
+        this.listForm.responsibleUnit = item.responsibleUnit
+        this.listForm.responsibleEngineer = item.responsibleEngineer
       })
     },
 
@@ -448,7 +458,6 @@ export default {
     handleSubmit() {
       this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
       this.listForm.commentText = this.commentText;
-      this.listForm.standId = this.listForm.standId;
       this.listForm.fenFlag = "1";
       this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);

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

@@ -107,12 +107,18 @@
             width="200"
             align="center"
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="productType"
@@ -243,14 +249,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column

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

@@ -107,12 +107,18 @@
             width="200"
             align="center"
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="productType"
@@ -243,14 +249,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/newProcess/index.vue

@@ -7,8 +7,8 @@
         <div class="process-name" @click="handleCreateProcess('2')">标准调研流程</div>
         <div class="process-name" @click="handleCreateProcess('1')">标准入库流程</div>
         <div class="process-name" @click="handleCreateProcess('3')">标准征求意见流程</div>
-        <div class="process-name" @click="handleCreateProcess('4')">标准需求(翻译)申请流程</div>
-        <div class="process-name" @click="handleCreateProcess('5')">标准发放申请流程</div>
+<!--        <div class="process-name" @click="handleCreateProcess('4')">标准需求(翻译)申请流程</div>-->
+<!--        <div class="process-name" @click="handleCreateProcess('5')">标准发放申请流程</div>-->
         <div class="process-name" @click="handleCreateProcess('6')">标准清单发布/更新流程</div>
         <div class="process-name" @click="handleCreateProcess('7')">项目合规评估流程</div>
         <div class="process-name" @click="handleCreateProcess('8')">未符合项整改流程</div>