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

src/components/navMenu/index.vue

@@ -286,11 +286,11 @@
                 path: '/standContrast',
                 menuId: '1d83a6278f781419f628e9f5560f5c86'
               },
-              {
+              // {
-                title: '标准化活动日历',
+              //   title: '标准化活动日历',
-                path: '/standCalendar',
+              //   path: '/standCalendar',
-                menuId: '5e834b3fca90619e593ad0ee83263885'
+              //   menuId: '5e834b3fca90619e593ad0ee83263885'
-              },
+              // },
               // {
               //   title: '标准比对库',
               //   path: '/standardComparisonLibrary',

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

@@ -269,7 +269,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import { saveTaskFirst } from 'api/process'
+import { queryTaskFirst, saveTaskFirst } from "api/process";
 import { taskDel } from 'api/process'
 export default {
   name: "bzdyStep1",
@@ -559,14 +559,13 @@ export default {
         this.saveLoading = false
       })
     },
-    handleSubmit(username) {
+    handleSubmit() {
       this.$refs['qbkwForm'].validate((valid) => {
         if (valid) {
           this.$refs['Form'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
               this.$http.post('lawss/activiti/startProcessRollBack', {
-                id: this.bpnId || '',
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,
                 type: '2',
@@ -586,14 +585,12 @@ export default {
                   }, {}, res => {
                     if (res.success) {
                       this.$message.success('流程发起成功')
-                      if (this.bpnId !== '') {
+                      let taskId = {
-                        let taskId = {
+                        id: this.$route.query.bpnId
-                          id: this.bpnId
-                        }
-                        taskDel(taskId).then(res=>{
-                          return res
-                        })
                       }
+                      taskDel(taskId).then(res=>{
+                        return res
+                      })
                       this.$router.push('/processCenter')
                     }
                     this.isSubmit = false
@@ -612,12 +609,28 @@ export default {
         }
       })
     },
-    aa () {
+    getData () {
-      return 11111
+      queryTaskFirst({
-    }
+        bpnId: this.bpnId
+      }).then(res => {
+        this.bpnId = this.$route.query.bpnId
+        let mes = JSON.parse(res.mes)
+        if (mes.form.date) {
+          mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+        } else {
+          mes.form.date = ''
+        }
+        this.form = mes.form
+        this.roleForm = mes.roleForm
+        this.commentText1 = mes.commentText1 || ''
+      })
+    },
   },
   mounted () {
     this.bpnId = this.$route.query.bpnId
+    if (this.bpnId !== undefined) {
+      this.getData()
+    }
   },
 }
 </script>

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

@@ -72,6 +72,31 @@
                     value-format="yyyy-MM-dd">
                   </el-date-picker>
                 </el-form-item>
+                <el-form-item v-if="verifySarStandard" label="归档位置" prop="treeListName" class="add-form-item form-item-disabled">
+                  <el-tooltip effect="dark" :content=form.treeListName placement="top-start">
+                    <el-input
+                      v-show="false"
+                      v-model="form.treeListId"
+                    ></el-input>
+                    <el-input
+                      v-model="form.treeListName"
+                      clearable
+                      placeholder="选择归档位置"
+                      @click.native="choiceTree('treeListName', '归档位置', form.treeListName)">
+                    </el-input>
+                  </el-tooltip>
+                  <tree-select-stand
+                    :key="key"
+                    :multiple=true
+                    :lazy=false
+                    :checkStrictly=true
+                    :modalShowFlag="modalShowTree"
+                    :drawerTitle="drawerTitle"
+                    width="800"
+                    :data="treeListOptions"
+                    :defaultProps="defaultProps" :checkedKeys="treeCheckedKeys"
+                    :nodeKey="nodeKey" @popoverHide="treeHide" @popoverHideCancel="treeHideCancel"></tree-select-stand>
+                </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item v-show="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
@@ -153,31 +178,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item v-if="verifySarStandard" label="归档位置" prop="treeListName" class="add-form-item form-item-disabled">
-                  <el-tooltip effect="dark" :content=form.treeListName placement="top-start">
-                    <el-input
-                      v-show="false"
-                      v-model="form.treeListId"
-                    ></el-input>
-                    <el-input
-                      v-model="form.treeListName"
-                      clearable
-                      placeholder="选择归档位置"
-                      @click.native="choiceTree('treeListName', '归档位置', form.treeListName)">
-                    </el-input>
-                  </el-tooltip>
-                  <tree-select-stand
-                    :key="key"
-                    :multiple=true
-                    :lazy=false
-                    :checkStrictly=true
-                    :modalShowFlag="modalShowTree"
-                    :drawerTitle="drawerTitle"
-                    width="800"
-                    :data="treeListOptions"
-                    :defaultProps="defaultProps" :checkedKeys="treeCheckedKeys"
-                    :nodeKey="nodeKey" @popoverHide="treeHide" @popoverHideCancel="treeHideCancel"></tree-select-stand>
-                </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
@@ -816,17 +816,18 @@
           </ProcessTitle>
           <div class="prc-content-border" v-show="verifySarStandard">
             <el-row :gutter="24">
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
-                  <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
+<!--                  <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">-->
-                    <el-input
+<!--                    <el-input-->
-                            v-model="form.dtbjh"
+<!--                            v-model="form.dtbjh"-->
-                            placeholder="请输入代替标准号"
+<!--                            placeholder="请输入代替标准号"-->
-                            clearable
+<!--                            clearable-->
-                    ></el-input>
+<!--                    ></el-input>-->
-                  </el-tooltip>
+<!--                  </el-tooltip>-->
                   <el-input
-                          v-else
+                    type="textarea"
+                    :title="form.dtbjh"
                     v-model="form.dtbjh"
                     placeholder="请输入代替标准号"
                     clearable
@@ -879,22 +880,24 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
                   <el-input
+                    type="textarea"
                     style="display:none;"
                     v-model="form.bfdtbzh"
                     placeholder="请输入部分代替标准号"
                   ></el-input>
-                  <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
+<!--                  <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">-->
-                    <el-input
+<!--                    <el-input-->
-                            v-model="form.bfbdtbzh"
+<!--                            v-model="form.bfbdtbzh"-->
-                            placeholder="请输入部分代替标准号"
+<!--                            placeholder="请输入部分代替标准号"-->
-                            clearable
+<!--                            clearable-->
-                    ></el-input>
+<!--                    ></el-input>-->
-                  </el-tooltip>
+<!--                  </el-tooltip>-->
                   <el-input
-                          v-else
+                    type="textarea"
+                    :title="form.bfbdtbzh"
                     v-model="form.bfbdtbzh"
                     placeholder="请输入部分代替标准号"
                     clearable
@@ -909,15 +912,16 @@
                   </el-button>
                 </el-form-item>
                 <el-form-item v-show="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
-                  <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
+<!--                  <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">-->
-                    <el-input
+<!--                    <el-input-->
-                            v-model="form.cbbh"
+<!--                            v-model="form.cbbh"-->
-                            placeholder="请输入采标编号"
+<!--                            placeholder="请输入采标编号"-->
-                            clearable
+<!--                            clearable-->
-                    ></el-input>
+<!--                    ></el-input>-->
-                  </el-tooltip>
+<!--                  </el-tooltip>-->
                   <el-input
-                          v-else
+                    type="textarea"
+                    :title="form.cbbh"
                     v-model="form.cbbh"
                     placeholder="请输入采标编号"
                     clearable
@@ -956,15 +960,17 @@
               </el-col>
               <el-col :span="24">
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
-                  <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
+<!--                  <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">-->
-                    <el-input
+<!--                    <el-input-->
-                      v-model="form.yybj"
+<!--                      type="textarea"-->
-                      placeholder="请输入引用标准"
+<!--                      v-model="form.yybj"-->
-                      clearable
+<!--                      placeholder="请输入引用标准"-->
-                    ></el-input>
+<!--                      clearable-->
-                  </el-tooltip>
+<!--                    ></el-input>-->
+<!--                  </el-tooltip>-->
                   <el-input
-                    v-else
+                    :title="form.yybj"
+                    type="textarea"
                     v-model="form.yybj"
                     placeholder="请输入引用标准"
                     clearable
@@ -2111,21 +2117,25 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
         this.defaultCheckedKeys3 = [this.form.dybxh]
-        this.treeCheckedKeys = this.form.treeListId.split(',')
+        if (this.form.treeListId) {
+          this.treeCheckedKeys = this.form.treeListId.split(',')
+        }
         this.form.standType = this.form.standInData === "0" ? 'INLAND' : 'FOREIGN'
         this.form.standYear = this.form.standYear ? this.form.standYear : ''
-        if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
+        if (this.form.country) {
           this.form.country = this.form.country.split(",");
         }
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
+        console.log(this.form);
 
         // 遍历对象初始化文件信息
         for (const p in this.form) {
@@ -3196,7 +3206,7 @@ export default {
     handleSave() {
       //文件处理
       this.fileInfoHandle();
-      this.form.country = this.countryArr;
+      // this.form.country = this.countryArr;
       // if(item.country !== undefined && item.country !== null){
       //   this.sarStandardsInfoEO.country = item.country.split(",");
       // }
@@ -3290,7 +3300,7 @@ export default {
                   if (res.ok) {
                     this.fileInfoHandle()
                     this.isSubmit = true
-                    this.form.country = this.countryArr;
+                    // this.form.country = this.countryArr;
                     var json = Object.assign(this.form, this.roleForm)
                     json.zrUserId = this.form.zrUserId
                     json.jlUserId = this.form.jlUserId
@@ -3349,7 +3359,7 @@ export default {
               } else {
                 this.fileInfoHandle()
                 this.isSubmit = true
-                this.form.country = this.countryArr;
+                // this.form.country = this.countryArr;
                 var json = Object.assign(this.form, this.roleForm)
                 json.zrUserId = this.form.zrUserId
                 json.jlUserId = this.form.jlUserId
@@ -3482,6 +3492,9 @@ export default {
   /deep/ .prc-content-border .form-item-disabled .el-form-item__content .el-input .el-input__inner {
     width: 100%;
   }
+  /deep/.el-form-item__content .el-textarea .el-textarea__inner {
+    width: 94%;
+  }
 
   /deep/ .search-area {
     display: contents;

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

@@ -555,10 +555,11 @@
           </ProcessTitle>
           <div class="prc-content-border">
             <el-row :gutter="24">
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
                     <el-input
+                            type="textarea"
                             disabled
                             v-model="form.dtbjh"
                             placeholder="请输入代替标准号"
@@ -568,6 +569,7 @@
                   <el-input
                           v-else
                           disabled
+                          type="textarea"
                           v-model="form.dtbjh"
                           placeholder="请输入代替标准号"
                           clearable
@@ -587,11 +589,12 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
                     <el-input
                             disabled
+                            type="textarea"
                             v-model="form.bfbdtbzh"
                             placeholder="请输入部分代替标准号"
                             clearable
@@ -600,6 +603,7 @@
                   <el-input
                           v-else
                           disabled
+                          type="textarea"
                           v-model="form.bfbdtbzh"
                           placeholder="请输入部分代替标准号"
                           clearable
@@ -610,6 +614,7 @@
                     <el-input
                             v-model="form.cbbh"
                             disabled
+                            type="textarea"
                             placeholder="请输入采标编号"
                             clearable
                     ></el-input>
@@ -617,6 +622,7 @@
                   <el-input
                           v-else
                           disabled
+                          type="textarea"
                           v-model="form.cbbh"
                           placeholder="请输入采标编号"
                           clearable
@@ -627,6 +633,7 @@
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
                     <el-input
+                      type="textarea"
                       v-model="form.yybj"
                       disabled
                       placeholder="请输入引用标准"
@@ -635,6 +642,7 @@
                   </el-tooltip>
                   <el-input
                     v-else
+                    type="textarea"
                     disabled
                     v-model="form.yybj"
                     placeholder="请输入引用标准"
@@ -1180,17 +1188,17 @@ export default {
         this.form = JSON.parse(JSON.stringify(item))
         let wssmrName = this.form.wssmrname || this.form.wssmr
         this.form.wssmr = wssmrName
-        this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx.split(',') : ''
+        this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx : ''
-        this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx.split(',') : ''
+        this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx : ''
-        this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx.split(',') : ''
+        this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx: ''
-        this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz.split(',') : ''
+        this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz : ''
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
         this.defaultCheckedKeys3 = [this.form.dybxh]
         this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
         this.form.standYear = this.form.standYear ? this.form.standYear : ''
-        if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
+        if (this.form.country) {
           this.form.country = this.form.country.split(",");
         }
         this.form.prcNum = this.prcNum
@@ -1236,16 +1244,6 @@ export default {
       this.handleSubmit();
     },
     handleSubmit() {
-      const val = this.form.country;
-      if (val !== "" && val !== null && typeof (val) !== "undefined") {
-        if (val instanceof Array) {
-          this.form.country = val.join(",");
-        } else {
-          this.form.country = val;
-        }
-      } else if (val === "") {
-        this.form.country = [];
-      }
       this.isSubmit = true;
       this.form.commentText = this.commentText;
       this.form.approvalOpinion = this.formTongGuo.approvalOpinion;

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

@@ -508,12 +508,13 @@
           </ProcessTitle>
           <div class="prc-content-border">
             <el-row :gutter="24">
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
                     <el-input
                             v-model="form.dtbjh"
                             disabled
+                            type="textarea"
                             placeholder="请输入代替标准号"
                             clearable
                     ></el-input>
@@ -522,6 +523,7 @@
                           v-else
                           v-model="form.dtbjh"
                           disabled
+                          type="textarea"
                           placeholder="请输入代替标准号"
                           clearable
                   ></el-input>
@@ -548,11 +550,12 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
                     <el-input
                             disabled
+                            type="textarea"
                             v-model="form.bfbdtbzh"
                             placeholder="请输入部分代替标准号"
                             clearable
@@ -561,6 +564,7 @@
                   <el-input
                           v-else
                           disabled
+                          type="textarea"
                           v-model="form.bfbdtbzh"
                           placeholder="请输入部分代替标准号"
                           clearable
@@ -571,6 +575,7 @@
                     <el-input
                             v-model="form.cbbh"
                             disabled
+                            type="textarea"
                             placeholder="请输入采标编号"
                             clearable
                     ></el-input>
@@ -579,6 +584,7 @@
                           v-else
                           v-model="form.cbbh"
                           disabled
+                          type="textarea"
                           placeholder="请输入采标编号"
                           clearable
                   ></el-input>
@@ -604,6 +610,7 @@
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
                     <el-input
+                      type="textarea"
                       v-model="form.yybj"
                       disabled
                       placeholder="请输入引用标准"
@@ -612,6 +619,7 @@
                   </el-tooltip>
                   <el-input
                     v-else
+                    type="textarea"
                     disabled
                     v-model="form.yybj"
                     placeholder="请输入引用标准"
@@ -1136,10 +1144,11 @@ export default {
         this.form = JSON.parse(JSON.stringify(item))
         let wssmrName = this.form.wssmrname || this.form.wssmr
         this.form.wssmr = wssmrName
-        this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx.split(',') : ''
+        this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx : ''
-        this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx.split(',') : ''
+        this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx : ''
-        this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx.split(',') : ''
+        this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx: ''
-        this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz.split(',') : ''
+        this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz: ''
+        this.form.country = this.form.country && this.form.country !== [] ? this.form.country: ''
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
@@ -1148,10 +1157,6 @@ export default {
         this.form.standYear = this.form.standYear ? this.form.standYear : ''
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
-        if( this.form.country !== undefined &&   this.form.country !== null &&   this.form.country !== ''){
-          this.form.country=this.form.country.split(",");
-        }
-
         this.form['id'] = item.id
         this.$forceUpdate()
       })

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

@@ -1072,10 +1072,11 @@
           </ProcessTitle>
           <div class="prc-content-border">
             <el-row :gutter="24">
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
                     <el-input
+                            type="textarea"
                             v-model="form.dtbjh"
                             placeholder="请输入代替标准号"
                             clearable
@@ -1083,6 +1084,7 @@
                   </el-tooltip>
                   <el-input
                           v-else
+                          type="textarea"
                           v-model="form.dtbjh"
                           placeholder="请输入代替标准号"
                           clearable
@@ -1134,22 +1136,25 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
                   <el-input
                           style="display:none;"
                           v-model="form.bfdtbzh"
+                          type="textarea"
                           placeholder="请输入部分代替标准号"
                   ></el-input>
                   <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
                     <el-input
                             v-model="form.bfbdtbzh"
+                            type="textarea"
                             placeholder="请输入部分代替标准号"
                             clearable
                     ></el-input>
                   </el-tooltip>
                   <el-input
                           v-else
+                          type="textarea"
                           v-model="form.bfbdtbzh"
                           placeholder="请输入部分代替标准号"
                           clearable
@@ -1167,12 +1172,14 @@
                   <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
                     <el-input
                             v-model="form.cbbh"
+                            type="textarea"
                             placeholder="请输入采标编号"
                             clearable
                     ></el-input>
                   </el-tooltip>
                   <el-input
                           v-else
+                          type="textarea"
                           v-model="form.cbbh"
                           placeholder="请输入采标编号"
                           clearable
@@ -1212,6 +1219,7 @@
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
                     <el-input
+                      type="textarea"
                       v-model="form.yybj"
                       placeholder="请输入引用标准"
                       clearable
@@ -1219,6 +1227,7 @@
                   </el-tooltip>
                   <el-input
                     v-else
+                    type="textarea"
                     v-model="form.yybj"
                     placeholder="请输入引用标准"
                     clearable
@@ -2648,7 +2657,9 @@ export default {
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
-        this.form.country = item.country.split(',')
+        if (typeof this.form.country === "string") {
+          this.form.country = this.form.country.split(",");
+        }
         this.$forceUpdate()
       })
     },
@@ -2762,7 +2773,6 @@ export default {
     handleSave() {
       //表单文件处理
       this.fileInfoHandle();
-      this.form.country = this.countryArr;
       this.form.commentText = this.commentText;
       this.saveLoading = true
       let _formData = new FormData()
@@ -2824,7 +2834,6 @@ export default {
       this.form.glwjName = this.glwjFileList.map(item => item.name).join(",")
     },
     handleSubmit() {
-      this.form.country = this.countryArr;
       this.$refs['form'].validate((valid) => {
         if (valid) {
           if (this.submitType === 1) {
@@ -2999,7 +3008,9 @@ export default {
   /deep/ .prc-content-border .form-item-disabled .el-form-item__content .el-input .el-input__inner {
     width: 70%;
   }
-
+  /deep/.el-form-item__content .el-textarea .el-textarea__inner {
+    width: 94%;
+  }
   /deep/ .el-upload-list__item-name {
     white-space: inherit;
   }

src/pages/processCenter/pages/phone/bzdy/step2.vue

@@ -24,6 +24,7 @@
                     <el-collapse-transition>
                         <div class="prc-content-border" v-if="foldFormFlag === false">
                             <van-cell-group>
+                              <van-field label="流程名称" v-model="form.processName" readonly />
                                 <van-field label="调研标题" v-model="form.title" readonly />
                                 <van-field label="完成时间" v-model="$moment(form.date).format('YYYY-MM-DD')" readonly />
                             </van-cell-group>
@@ -265,25 +266,26 @@
                     }
                 })
             },
-            getData() {
+          getData() {
-                return new Promise((resolve, reject) => {
+            return new Promise((resolve, reject) => {
-                    inboundLiaisonDetail({
+              inboundLiaisonDetail({
-                        taskIds: this.taskIds,
+                taskIds: this.taskIds,
-                        pId: this.pId
+                pId: this.pId
-                    }).then(res => {
+              }).then(res => {
-                        let data = JSON.parse(res.mesg)
+                let data = JSON.parse(res.mesg)
-                        this.form.fjList = data.fjList || data.form.fjList
+                this.form.fjList = data.fjList || data.form.fjList
-                        this.form.modelList = data.modelList || data.form.modelList
+                this.form.modelList = data.modelList || data.form.modelList
-                        this.form.title = data.title || data.form.title
+                this.form.title = data.title || data.form.title
-                        this.form.date = data.date || data.form.date
+                this.form.processName = data.processName || data.form.processName
-                        this.json = data || data.form
+                this.form.date = data.date || data.form.date
-                        this.form.responUserList = data.form?  data.form.responUserList : ''
+                this.json = data || data.form
-                        this.form.responUserListName = data.form?  data.form.responUserListName : ''
+                this.form.responUserList = data.form?  data.form.responUserList : ''
-                        this.commentText2 = data.commentText2 || ''
+                this.form.responUserListName = data.form?  data.form.responUserListName : ''
-                    }).catch(e => {
+                this.commentText2 = data.commentText2 || ''
-                    })
+              }).catch(e => {
-                })
+              })
-            },
+            })
+          },
         },
         mounted () {
             this.getData()

src/pages/processCenter/pages/phone/bzdy/step4.vue

@@ -24,6 +24,7 @@
                     <el-collapse-transition>
                         <div class="prc-content-border" v-if="foldFormFlag === false">
                             <van-cell-group>
+                                <van-field label="流程名称" v-model="form.processName" readonly />
                                 <van-field label="调研标题" v-model="form.title" readonly />
                                 <van-field label="完成时间" v-model="$moment(form.date).format('YYYY-MM-DD')" readonly />
                             </van-cell-group>
@@ -94,7 +95,6 @@
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
-                @save="handleSave"
                 @submit="handleSubmit"
                 show-back
                 @back="handleSubmitNo"
@@ -268,6 +268,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.processName = data.form ? data.form.processName : data.processName
                         this.form.dyhz = data.form ? data.form.dyhz : data.dyhz
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date

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

@@ -24,6 +24,7 @@
                     <el-collapse-transition>
                         <div class="prc-content-border" v-if="foldFormFlag === false">
                             <van-cell-group>
+                                <van-field label="流程名称" v-model="form.processName" readonly />
                                 <van-field label="调研标题" v-model="form.title" readonly />
                                 <van-field label="完成时间" v-model="$moment(form.date).format('YYYY-MM-DD')" readonly />
                             </van-cell-group>
@@ -324,6 +325,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.processName = data.form ? data.form.processName : data.processName
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form

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

@@ -23,6 +23,7 @@
                     <el-collapse-transition>
                         <div class="prc-content-border" v-if="foldFormFlag === false">
                             <van-cell-group>
+                                <van-field label="流程名称" v-model="form.processName" readonly />
                                 <van-field label="调研标题" v-model="form.title" readonly />
                                 <van-field label="完成时间" v-model="$moment(form.date).format('YYYY-MM-DD')" readonly />
                             </van-cell-group>
@@ -286,6 +287,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.processName = data.form ? data.form.processName : data.processName
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form

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

@@ -23,6 +23,7 @@
                     <el-collapse-transition>
                         <div class="prc-content-border" v-if="foldFormFlag === false">
                             <van-cell-group>
+                                <van-field label="流程名称" v-model="form.processName" readonly />
                                 <van-field label="调研标题" v-model="form.title" readonly />
                                 <van-field label="完成时间" v-model="$moment(form.date).format('YYYY-MM-DD')" readonly />
                             </van-cell-group>
@@ -286,6 +287,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.processName = data.form ? data.form.processName : data.processName
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form

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

@@ -23,6 +23,7 @@
                     <el-collapse-transition>
                         <div class="prc-content-border" v-if="foldFormFlag === false">
                             <van-cell-group>
+                                <van-field label="流程名称" v-model="form.processName" readonly />
                                 <van-field label="调研标题" v-model="form.title" readonly />
                                 <van-field label="完成时间" v-model="$moment(form.date).format('YYYY-MM-DD')" readonly />
                             </van-cell-group>
@@ -288,6 +289,7 @@
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
                         this.commentText9 = data.commentText9 || ''
+                        this.form.processName = data.form ? data.form.processName : data.processName
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form

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

@@ -39,7 +39,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准类别" v-show="form.standInData === '0'" prop="standSort" class="add-form-item form-item-disabled">
+            <el-form-item label="标准类别"  prop="standSort" class="add-form-item form-item-disabled">
               <el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
                 <el-option
                   v-for="item in standSortOptions"
@@ -109,9 +109,31 @@
                 <el-radio label="2">否</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
+            <el-form-item  label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
               <el-input v-model="form.standSystem" disabled></el-input>
             </el-form-item>
+            <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
+              <el-input
+                disabled
+                v-model="form.gxhbq"
+                placeholder="请输入标签"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="归档位置" class="add-form-item form-item-disabled">
+              <el-input
+                style="display: none"
+                v-model="form.treeListId"
+              ></el-input>
+              <el-tooltip effect="dark" :content=form.treeListName placement="top-start">
+                <el-input
+                  v-model="form.treeListName"
+                  clearable
+                  placeholder="选择归档位置"
+                  readonly>
+                </el-input>
+              </el-tooltip>
+            </el-form-item>
           </div>
           <ProcessTitle>
             <template slot="title">实施日期</template>
@@ -252,12 +274,25 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
+              <el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple disabled>
+                <el-option
+                  v-for="item in sycpxOptions"
+                  placeholder="请选择"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="item.label"
+                ></el-option>
+              </el-select>
+            </el-form-item>
             <van-field label="关联模块--乘用车VPPS编码" v-model="form.cycvppsbm" readonly   placeholder="请输入乘用车VPPS编码"/>
             <van-field label="关联模块--卡车VPPS编码" v-model="form.kccvppsbm" readonly placeholder="请输入卡车VPPS编码"/>
             <van-field label="关联模块--乘用车vpps中文名称" v-model="form.cycvppscn" readonly placeholder="请输入乘用车vpps中文名称" />
             <van-field label="关联模块--卡车vpps中文名称" v-model="form.kccvppscn" placeholder="请输入卡车vpps中文名称" readonly />
-            <van-field label="模块结构单元变型号" v-model="form.dybxh" readonly  placeholder="请输入模块结构单元变型号"/>
+            <van-field label="模块结构单元变型号(卡车)" v-model="form.dybxh" readonly  placeholder="请输入模块结构单元变型号"/>
-            <van-field label="模块结构单元名称" v-model="form.dymc" readonly placeholder="请输入模块结构单元名称" />
+            <van-field label="模块结构单元名称(卡车)" v-model="form.dymc" readonly placeholder="请输入模块结构单元名称" />
+            <van-field label="模块结构单元变型号(乘用车)" v-model="form.dybxhcar" readonly  placeholder="请输入模块结构单元变型号"/>
+            <van-field label="模块结构单元名称(乘用车)" v-model="form.dymccar" readonly placeholder="请输入模块结构单元名称" />
             <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
               <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门" disabled>
                 <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -274,28 +309,17 @@
                 ></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-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>
+<!--              <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>-->
-                <el-option
+<!--                <el-option-->
-                  v-for="item in txlbOptions"
+<!--                  v-for="item in txlbOptions"-->
-                  placeholder="请选择"
+<!--                  placeholder="请选择"-->
-                  :key="item.value"
+<!--                  :key="item.value"-->
-                  :value="item.value"
+<!--                  :value="item.value"-->
-                  :label="item.label"
+<!--                  :label="item.label"-->
-                ></el-option>
+<!--                ></el-option>-->
-              </el-select>
+<!--              </el-select>-->
-            </el-form-item>
+<!--            </el-form-item>-->
-            <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
-              <el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple disabled>
-                <el-option
-                  v-for="item in sycpxOptions"
-                  placeholder="请选择"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
             <el-form-item style="display: none" label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
               <el-select v-model="form.syrz" placeholder="请选择适用认证" multiple disabled>
                 <el-option
@@ -356,25 +380,16 @@
         </el-form>
       </div>
       <div>
-        <el-collapse accordion v-model="activeName">
+        <el-collapse accordion>
-          <el-collapse-item title="审批意见" name="1">
+          <el-collapse-item title="审批意见">
             <div style="margin: 10px 0;">
-              <el-form
+              <el-input
-                ref="formTongGuo"
+                type="textarea"
-                :model="formTongGuo"
+                :rows="3"
-                :rules="rules">
+                resize="none"
-                <el-form-item
+                placeholder="请输入意见"
-                  prop="commentText"
+                v-model="commentText">
-                >
+              </el-input>
-                  <el-input
-                    type="textarea"
-                    :rows="3"
-                    resize="none"
-                    placeholder="请输入意见"
-                    v-model="formTongGuo.commentText">
-                  </el-input>
-                </el-form-item>
-              </el-form>
             </div>
           </el-collapse-item>
         </el-collapse>
@@ -426,6 +441,7 @@ export default {
   name: "phoneBzrkStep2",
   data() {
     return {
+      commentText: '',
       textStatusMap: {}, // 文本状态id与name对应
       xgdFileMap: [],
       fbgbjbdFileMap: [],
@@ -788,6 +804,8 @@ export default {
             // jdwjFileMap: {},
             this.kwjFileMap = this.assemble(processForm.kwj, processForm.kwjName);
             // kwjFileMap: {},
+            this.xdbFileMap = this.assemble(processForm.xdb, processForm.xdbName);
+            // xdbFileMap: {},
             this.glwjFileMap = this.assemble(processForm.glwj, processForm.glwjName);
             // glwjFileMap: {},
             this.caFileMap = this.assemble(processForm.ca, processForm.caName);
@@ -806,14 +824,19 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
-/*        console.log(this.form)
+        let wssmrName = this.form.wssmrname || this.form.wssmr
+        this.form.wssmr = wssmrName
+        this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx : ''
+        this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx : ''
+        this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx: ''
+        this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz : ''
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
-        this.defaultCheckedKeys3 = [this.form.dybxh]*/
+        this.defaultCheckedKeys3 = [this.form.dybxh]
         this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
-        this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
+        this.form.standYear = this.form.standYear ? this.form.standYear : ''
-        if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
+        if (this.form.country) {
           this.form.country = this.form.country.split(",");
         }
         this.form.prcNum = this.prcNum
@@ -845,7 +868,7 @@ export default {
     handleSave() {
     },
     handle1() {
-      if(this.formTongGuo.commentText){
+      if(this.commentText){
         this.formTongGuo.approvalOpinion = 1
         this.handleSubmit()
       }else{
@@ -857,16 +880,6 @@ export default {
       this.handleSubmit()
     },
     handleSubmit() {
-      const val = this.form.country;
-      if (val !== "" && val !== null && typeof (val) !== "undefined") {
-        if (val instanceof Array) {
-          this.form.country = val.join(",");
-        } else {
-          this.form.country = val;
-        }
-      } else if (val === "") {
-        this.form.country = [];
-      }
       this.isSubmit = true;
       this.form.commentText = this.commentText;
       this.form.approvalOpinion = this.formTongGuo.approvalOpinion;

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -621,7 +621,7 @@ export default {
               // 法规入库及评估流程
         case '2':
           this.$router.push({
-            name: 'bzdyStep1-1',
+            name: 'bzdyStep1',
             query: {
               type: '2',
               processName: '标准调研流程',

src/pages/regulatoryRepository/workingGroup/index.vue

@@ -14,7 +14,10 @@
 <!--                <workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>-->
 <!--            </el-tab-pane>-->
         </el-tabs>
-      <el-button size="mini" type="primary" @click="statisticsBtn" v-btn-permission="'2331baafd7d298b87ab3c0b5430d608d'" class="statistics">工作组统计</el-button>
+      <div class="statistics">
+        <el-button size="mini" type="primary" @click="calendarBtn" v-btn-permission="'5e834b3fca90619e593ad0ee83263885'" >标准化活动日历</el-button>
+        <el-button size="mini" type="primary" @click="statisticsBtn" v-btn-permission="'2331baafd7d298b87ab3c0b5430d608d'">工作组统计</el-button>
+      </div>
     </div>
 </template>
 <script>
@@ -36,7 +39,10 @@
             this.$router.push({
               name: 'dataStatisComments'
             })
-          }
+          },
+          calendarBtn(){
+           this.$router.push('/standCalendar')
+          },
         },
         mounted() {},
         beforeDestroy() {}