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

src/pages/config/pages/attributeCustom/components/stand.vue

@@ -2,8 +2,8 @@
 <template>
   <div class="attribute-custom v-class">
     <div class="action-bar1">
-      <el-button class="common-button-primary add-button" size="mini" v-btn-permission="'df57f63c9e993bbfb2a4b400d5257577'" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
+      <el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
-      <el-button class="common-button-default" size="mini" v-btn-permission="'9557b51320a50728d7047448d01c57c6'" @click="showDisplayLocationDialog">展示区域管理</el-button>
+      <el-button class="common-button-default" size="mini" v-btn-permission="''" @click="showDisplayLocationDialog">展示区域管理</el-button>
     </div>
     <loading :loading="attributeDataLoading">数据处理中</loading>
     <div class="content">
@@ -76,8 +76,8 @@
               <el-dropdown trigger="click" @command="handleCommand">
 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item v-btn-permission="'abba040e019fad5092624ffd71a70372'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
+                  <el-dropdown-item v-btn-permission="''" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
-                  <el-dropdown-item v-btn-permission="'730c9240a8f80bcdb88c71adb37f2aa7'" :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                  <el-dropdown-item v-btn-permission="''" :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>

src/pages/config/pages/attributeCustom/index.vue

@@ -6,11 +6,11 @@
           <stand v-if="tabValue === 'stand'"></stand>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="国内外政策" name="laws">
+<!--      <el-tab-pane label="国内外政策" name="laws">
         <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <laws v-if="tabValue === 'laws'"></laws>
         </div>
-      </el-tab-pane>
+      </el-tab-pane>-->
       <el-tab-pane label="企业标准库" name="buss">
         <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <buss v-if="tabValue === 'buss'"></buss>

src/pages/details/otherStandardDetails/index.vue

@@ -52,7 +52,7 @@
                   <label style=" margin-right: 132px;"
                           title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
                   >文本状态<i class="el-icon-warning-outline"></i></label>
-                  <span style="color: #409EFF;">{{ sarStandardsInfoEO.textStatus || '-' }}</span>
+                  <span style="color: #409EFF;">{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
                 </p>
                 <p><label style=" margin-right: 150px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
                 <p><label style=" margin-right: 76px;">是否纳入认证清单</label><span>{{sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'}}</span></p>
@@ -136,6 +136,13 @@
                   {{ '-' }}
                 </template>
               </span>
+              <span
+                  v-else-if="child.attrType === 'DATE_PICKER'"
+                  class="modular-content-p-val"
+                  :title="child.value || '-'"
+              >
+                {{ child.value ? child.value.substring(0,10) : '-' }}
+              </span>
               <span
                 v-else-if="child.attrType !== 'FILE'"
                 class="modular-content-p-val"
@@ -1241,13 +1248,21 @@ export default {
         content: ''
       },
       itemsText: '',
-      itemsTextDialogs: false
+      itemsTextDialogs: false,
+      textStatusMap: {},
     }
   },
   props: {
   },
   watch: {},
   methods: {
+    // 将文本状态的id与name对应
+    setMap(data){
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label)
+      })
+      console.log(this.textStatusMap, '文本状态的值')
+    },
     statusClick () {
       let routeUrl = this.$router.resolve({
         name: 'standInvolveProjectTwo',
@@ -2614,6 +2629,7 @@ export default {
       this.emergyKindOptions = res.data.ENERGYTYPES
       this.requestOptions = res.data.REQUESTTYPE
       this.BZFGGXOUIUJ = res.data.BZFGGXOUIUJ // 企标覆盖关系
+      this.setMap(res.data.WBZTCLASS) // 文本状态
     }, e => {
     })
     Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then((values) => {

src/pages/home1/components/release/index.vue

@@ -46,12 +46,11 @@ export default {
     //获取数据
     getAdvice() {
       let obj = {}
-      obj.msgType = 'RESOURCE'
+      obj.limit = 8
-      obj.rowLimit = 8
+      this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
-      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', obj, {
         _this: this
       }, res => {
-        this.standardReleaseList = res.data.list
+        this.standardReleaseList = res.data
       }, e => {
       })
     },

src/pages/home1/index.vue

@@ -110,7 +110,25 @@ export default {
       })
     },
     MORE() {
-      this.$router.push({name: 'standardForComments'})
+      switch (this.activeName) {
+        case 'solicitOpinions':
+          this.$router.push({name: 'standardForComments'})
+          break
+        case 'release':
+          this.$confirm('请选择国内/海外标准', {
+            confirmButtonText: '国内标准',
+            cancelButtonText: '海外标准',
+            type: 'warning',
+            center: true
+          }).then(() => {
+            this.$router.push({name: 'domesticStandardsAndRegulations'})
+          }).catch(() => {
+            this.$router.push({name: 'foreignStandardsAndRegulations'})
+          });
+          break
+        default:
+          break
+      }
     }
   },
 }

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

@@ -532,15 +532,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-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
+                                  <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
-                                        <el-option
+                                    <el-option
-                                                v-for="item in qcdwOptions"
+                                        v-for="item in qcdwOption"
-                                                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 v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
@@ -1248,15 +1248,15 @@
                     // 适用范围
                     txlb: '', // 体系类别
                     gkdw: '', // 归口管理部门
-                    qcdw: '', // 起草单位
+                    qcdw: [], // 起草单位
-                    wssmr: '', // 我司署名人
+                    wssmr: [], // 我司署名人
                     cysd: '', // 我司参与深度
-                    cllx: '', // 适用车型
+                    cllx: [], // 适用车型
-                    nylx: '',// 能源类型
+                    nylx: [],// 能源类型
-                    sycpx: '',// 适用产品线
+                    sycpx: [],// 适用产品线
-                    syrz: '', // 适用认证
+                    syrz: [], // 适用认证
-                    zrbm: '', // 责任部门
+                    zrbm: [], // 责任部门
-                    zrgcs: '', // 责任工程师
+                    zrgcs: [], // 责任工程师
                     cycvppsbm: '', // 关联模块--乘用车VPPS编码
                     cycvppscn: '', // 关联模块--乘用车vpps中文名称
                     kccvppsbm: '', // 关联模块--卡车VPPS编码
@@ -1336,10 +1336,10 @@
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
                 wssmrOptions: [], // 我司署名人
-                qcdwOptions: [], // 起草单位
                 sycpxOptions: [], // 适用产品线
                 zrbmOptions: [], // 责任部门
                 zrgcsOptions: [], // 责任工程师
+                qcdwOption: [], // 起草单位
                 txlbOptions: [], // 体系类别
                 data: [], // 标准列表数据
                 ListForm: {}, // 新增数据
@@ -1452,15 +1452,15 @@
                         // 适用范围
                         txlb: '', // 体系类别
                         gkdw: '', // 归口管理部门
-                        qcdw: '', // 起草单位
+                        qcdw: [], // 起草单位
-                        wssmr: '', // 我司署名人
+                        wssmr: [], // 我司署名人
                         cysd: '', // 我司参与深度
-                        cllx: '', // 适用车型
+                        cllx: [], // 适用车型
-                        nylx: '',// 能源类型
+                        nylx: [],// 能源类型
-                        sycpx: '',// 适用产品线
+                        sycpx: [],// 适用产品线
-                        syrz: '', // 适用认证
+                        syrz: [], // 适用认证
-                        zrbm: '', // 责任部门
+                        zrbm: [], // 责任部门
-                        zrgcs: '', // 责任工程师
+                        zrgcs: [], // 责任工程师
                         cycvppsbm: '', // 关联模块--乘用车VPPS编码
                         cycvppscn: '', // 关联模块--乘用车vpps中文名称
                         kccvppsbm: '', // 关联模块--卡车VPPS编码
@@ -1497,6 +1497,14 @@
                             console.log(bringData)
                             const json = Object.assign(bringData, bringData.attrInfoCaseMap);
                             this.form = JSON.parse(JSON.stringify(json))
+                            this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw.split(',')
+                            this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr.split(',')
+                            this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs.split(',')
+                            this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm.split(',')
+                            this.form.syrz = JSON.parse(JSON.stringify(json)).syrz.split(',')
+                            this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx.split(',')
+                            this.form.nylx = JSON.parse(JSON.stringify(json)).nylx.split(',')
+                            this.form.cllx = JSON.parse(JSON.stringify(json)).cllx.split(',')
                             this.defaultCheckedKeys = [this.form.standSystem];
                             this.defaultCheckedKeys1 = [this.form.cycvppsbm];
                             this.defaultCheckedKeys2 = [this.form.kccvppsbm];
@@ -2018,11 +2026,10 @@
                 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 // 责任工程师
-                this.txlbOptions = res.data.TXLBCLASS // 体系类别
+                this.qcdwOption = res.data.QCDW // 体系类别
             })
             this.busVsFunc()
             this.modelFunc()

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

@@ -163,41 +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">-->
+            <div class="left">
-<!--              <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" style="margin-left:10px">-->
+              <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-form-item label="类型" class="search-item search-item-last">
-<!--                  <el-input-->
+                  <el-select
-<!--                    v-model="sarSarAccessEOSearch.standName"-->
+                    @change="typeChange"
-<!--                    placeholder="请输入标准号"-->
+                    v-model="standardSearch.standType"
-<!--                  ></el-input>-->
+                    placeholder="请选择"
-<!--                </el-form-item>-->
+                    filterable
-<!--                <el-form-item label="标准名称" class="search-item search-item-last">-->
+                  >
-<!--                  <el-input-->
+                    <el-option
-<!--                    v-model="sarSarAccessEOSearch.standNumber"-->
+                      v-for="item in standardTypeOptions"
-<!--                    placeholder="请输入标准名称"-->
+                      :value="item.value"
-<!--                  ></el-input>-->
+                      :key="item.value"
-<!--                </el-form-item>-->
+                      :label="item.label"
-<!--                <el-form-item class="search-item btn-box">-->
+                    >
-<!--                  <el-button-->
+                    </el-option>
-<!--                    :loading="searching"-->
+                  </el-select>
-<!--                    type="primary"-->
+                </el-form-item>
-<!--                    class="common-button-primary"-->
+                <el-form-item label="标准号/标准名称" class="search-item search-item-last">
-<!--                    size="small"-->
+                  <el-input
-<!--                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"-->
+                    v-model="standardSearch.standName"
-<!--                    @click="getStandData">-->
+                    placeholder="请输入标准号或标准名称"
-<!--                    查询-->
+                  ></el-input>
-<!--                  </el-button>-->
+                </el-form-item>
-<!--                </el-form-item>-->
+                <el-form-item class="search-item btn-box">
-<!--                <el-form-item class="search-item btn-box">-->
+                  <el-button
-<!--                  <el-button-->
+                    :loading="searching"
-<!--                    class="common-button-default"-->
+                    type="primary"
-<!--                    size="small"-->
+                    class="common-button-primary"
-<!--                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"-->
+                    size="small"
-<!--                    @click="clearSearch">清空-->
+                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
-<!--                  </el-button>-->
+                    @click="getStandData">
-<!--                </el-form-item>-->
+                    查询
-<!--              </el-form>-->
+                  </el-button>
-<!--            </div>-->
+                </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"
@@ -381,12 +391,22 @@ export default {
       drawerTitle: "", //drawer标题
       // 查询相关参数
       searching: false,
-      sarSarAccessEOSearch: {
+      standardSearch: {
+        standType:'',
         standName:'',
-        standNumber:'',
-        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent
       },
+      standardTypeOptions: [
+        {
+          value: 'INLAND',
+          label: '国内标准法规',
+          item:'INLAND',
+        },
+        {
+          value: 'FOREIGN',
+          label: '海外标准法规',
+          item:'FOREIGN',
+        },
+      ],
       nodeList: [],
       defaultProps: {
         children: "children",
@@ -453,7 +473,8 @@ export default {
           id: "",
           itemsName: "",
           itemsNum: "",
-          responsibleUnit: "",
+          responsibleUnit: "",  //责任部门
+          responsibleEngineer: "", //责任工程师
           standId: "",
           svpps: ""
         }],
@@ -521,6 +542,9 @@ export default {
     handleTabs(name) {
       this.active = name;
     },
+    typeChange(type) {
+      this.standardSearch.standType = type
+    },
     choiceShow() {
       this.ListModel = true;
     },
@@ -543,7 +567,6 @@ export default {
     },
     // 点击批量删除事件
     deleteList() {
-      console.log(this.selectList.length);
        if(this.selectList.length < 1){
          this.$message.warning('请选择一条数据进行删除')
        }else {
@@ -610,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.XCXSSRQ =  this.sarAccessListDatas[0].xcxssrqgj
-      json.ZCCSSRQ =  this.sarAccessListDatas[0].attrInfoMap.ZCCSSRQ
+      json.ZCCSSRQ =  this.sarAccessListDatas[0].zccssrqgj
       this.$refs['listForm'].validate((valid) => {
         if (valid) {
           this.$refs['roleForm'].validate((valid) => {
@@ -660,7 +683,7 @@ export default {
         }, {
           _this: this
         }, res => {
-          console.log(res.data);
+          console.log(res)
           this.listForm.breakdownList = res.data;
           this.ListModel = false;
         }, e => {
@@ -733,22 +756,24 @@ export default {
       });
     },
     //获取标准数据
-    getStandData() {
+    getStandData(){
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+      this.$http.post('SarStandItems/sar-stand-items/findStand',{
         page: this.page,
-        pageSize: this.pageSize,
+        size: this.pageSize,
-      }, {
+        ...this.standardSearch,
-        _this: this
+      },{
+        _this: this,
       }, res => {
-        this.sarAccessListDatas = res.data.list;
+        this.sarAccessListDatas = res.records;
-        this.total = res.data.count;
+        this.total = res.total
       }, e => {
-      });
+
+      })
     },
     clearSearch() {
-      this.sarSarAccessEOSearch = {
+      this.standardSearch = {
         standName: "",
-        standNumber: ""
+        standType:"",
       };
       this.getStandData();
     },

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

@@ -241,7 +241,8 @@ export default {
           id: "",
           itemsName: "",
           itemsNum: "",
-          responsibleUnit: "",
+          responsibleUnit: "",  //责任部门
+          responsibleEngineer: "", //责任工程师
           standId: "",
           svpps: ""
         }],
@@ -316,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
@@ -323,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
       })
     },
 
@@ -342,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"
@@ -382,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,
@@ -398,6 +406,7 @@ export default {
             zCCSSRQ:  item.pepdtos[i].zCCSSRQ,
           });
         }
+        console.log(item.pepdtos);
       }
     },
     saveUserInfo() {
@@ -440,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"
@@ -494,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
       })
     },
 
@@ -504,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"
@@ -426,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
       })
     },
 
@@ -446,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"

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"

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue

@@ -117,7 +117,7 @@
               }}</span>
           </template>
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
           prop="applicationScope"
           label="适用领域"
           align="center">
@@ -126,11 +126,10 @@
               v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
               }}</span>
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column
           prop="updateTime"
           label="更新时间"
-          sortable
           align="center">
           <template slot-scope="scope">
             <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD hh:mm:ss')  : scope.row.updateTime }}</div>
@@ -188,6 +187,7 @@ export default {
       selectedList: [],
       // 新增、编辑 准入信息字段
       sarAccessEO: {
+        relateFile: '',
         country: "",
         applyArctic: "",
         energyKind: "",
@@ -261,11 +261,13 @@ export default {
     searchSarAccess() {
       this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
         sortKey: 1,
+        page: 1,
+        pageSize: 10,
         ...this.sarSarAccessEOSearch,
       }, {
         _this: this
       }, res => {
-        this.sarAccessListDatas = res.data.records;
+        this.sarAccessListDatas = res.data.records
         this.sarAccessListTotal = res.data.total
       }, e => {
 

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue

@@ -108,7 +108,7 @@
               }}</span>
           </template>
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
           prop="applicationScope"
           label="适用领域"
           align="center">
@@ -117,14 +117,13 @@
               v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
               }}</span>
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column
           prop="updateTime"
           label="更新时间"
-          sortable
           align="center">
           <template slot-scope="scope">
-            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD hh:mm:ss')  : scope.row.updateTime }}</div>
+            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD')  : scope.row.updateTime }}</div>
           </template>
         </el-table-column>
         <el-table-column
@@ -269,6 +268,8 @@ export default {
     searchSarAccess() {
       this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
         ...this.sarSarAccessEOSearch,
+        page: 1,
+        pageSize: 10,
         sortKey: 3
       }, {
         _this: this

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue

@@ -109,7 +109,7 @@
               }}</span>
           </template>
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
           prop="applicationScope"
           label="适用领域"
           align="center">
@@ -118,14 +118,13 @@
               v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
               }}</span>
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column
           prop="updateTime"
           label="更新时间"
-          sortable
           align="center">
           <template slot-scope="scope">
-            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD hh:mm:ss')  : scope.row.updateTime }}</div>
+            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD')  : scope.row.updateTime }}</div>
           </template>
         </el-table-column>
         <el-table-column
@@ -270,6 +269,8 @@ export default {
     searchSarAccess() {
       this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
         ...this.sarSarAccessEOSearch,
+        page: 1,
+        pageSize: 10,
         sortKey: 2
       }, {
         _this: this
@@ -294,7 +295,7 @@ export default {
         projectName: "",
         detailedListName: "",
       };
-      this.searchSarAccess();
+      this.searchSarAccess()
 
     },
     // 新增相关

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -28,7 +28,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
+<!--            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
               <el-select
                   v-model="sarAccessEO.applicationScope"
                   multiple
@@ -45,7 +45,7 @@
                 >
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item>-->
             <br/><br/>
             <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
               <el-input
@@ -336,40 +336,93 @@
         >
         </el-table-column>
         <el-table-column
-            prop="issueTime"
+          prop="issueTime"
-            sortable
+          align="center"
-            label="发布日期">
+          width="180px"
+          label="英文名称">
         </el-table-column>
         <el-table-column
-            prop="xcxssrq"
+          prop="issueTime"
-            sortable
+          align="center"
-            label="新车型实施日期">
+          width="180px"
+          label="适用车型">
         </el-table-column>
         <el-table-column
-            show-overflow-tooltip
+          prop="issueTime"
-            prop="zccssrq"
+          align="center"
-            sortable
+          width="180px"
-            label="在产车实施日期">
+          label="能源类型">
         </el-table-column>
         <el-table-column
-            show-overflow-tooltip
+          prop="issueTime"
-            prop="textStatus"
+          sortable
-            width="120px"
+          align="center"
-            label="文本状态">
+          width="210px"
+          label="标准实施日期">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="zccssrq"
+          sortable
+          width="210px"
+          align="center"
+          label="在产车实施日期">
+        </el-table-column>
+        <el-table-column
+          prop="XCXSSRQ"
+          sortable
+          align="center"
+          width="210px"
+          label="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="zccssrq"
+          width="210px"
+          align="center"
+          label="责任部门">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          width="180px"
+          align="center"
+          label="适用产品线">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          width="210px"
+          align="center"
+          label="乘用车VPPS中文名称">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          align="center"
+          width="210px"
+          label="卡车VPPS编码">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          align="center"
+          width="210px"
+          label="卡车VPPS中文名称">
         </el-table-column>
         <el-table-column>
           <template slot-scope="scope">
             <el-button
-                class="common-button-default"
+              class="common-button-default"
-                type="primary"
+              type="primary"
-                size="small" @click="moveUp(scope.$index, scope.row)"
+              size="small" @click="moveUp(scope.$index, scope.row)"
-                v-if="!disabledFlag"
+              v-if="!disabledFlag"
             >上移</el-button>
             <el-button
-                class="common-button-default"
+              class="common-button-default"
-                type="danger"
+              type="danger"
-                size="small" @click="moveDown(scope.$index, scope.row)"
+              size="small" @click="moveDown(scope.$index, scope.row)"
-                v-if="!disabledFlag"
+              v-if="!disabledFlag"
             >下移</el-button>
           </template>
         </el-table-column>
@@ -484,7 +537,7 @@ export default {
         type: '',
         relateFile: '',
         remark: '', // 清单说明
-        applicationScope: '' //适用领域
+        // applicationScope: '' //适用领域
       },
       fileInfoList: [], // 上传的附件
       uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
@@ -499,6 +552,9 @@ export default {
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
           {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
+        ],
+        remark: [
+          {required: true,type: 'string', max: 500, message: '表单名称不能超过500个字符', trigger: 'blur'}
         ]
       },
       disabledFlag: false,
@@ -525,7 +581,7 @@ export default {
       sarAccessInfoSearch: {
         id: '',
         countryArea: '', // 国家
-        applicationScope: '', //适用区域
+        // applicationScope: '', //适用区域
         keywords: '', // 关键字
         detailedListName: '', //清单名称
         applyArctic: '', // 能源种类
@@ -790,6 +846,7 @@ export default {
     uploadBackSuccess (res, file, fileList) {
       if (res.ok) {
         this.fileInfoList = fileList
+        console.log(this.fileInfoList)
         this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
         this.$message.success('上传成功')
       } else {
@@ -1122,7 +1179,7 @@ export default {
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = JSON.stringify(rowlist)
           sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
-          sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
+          // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
           if (this.fileInfoList.length > 0) {
             let relateFile = []
@@ -1130,6 +1187,7 @@ export default {
               relateFile.push(item.id)
             })
             sarAccessEO.relateFile = relateFile.join(',')
+            console.log(sarAccessEO.relateFile)
           }
           if (!sarAccessEO.id) {
             // 新增
@@ -1140,10 +1198,15 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
+                this.$message.success('新增成功')
                 this.isNext = true
                 this.$router.push({
-                  name: 'AccessStandardsAndRegulations'
+                  name: 'AccessStandardsAndRegulations',
+                  query: {
+                    relateFile: sarAccessEO.relateFile
+                  }
                 })
+                console.log(sarAccessEO)
               }
             }, e => {
             })
@@ -1154,6 +1217,7 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
+                this.$message.success('编辑成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1376,8 +1440,8 @@ export default {
                 this.sarAccessInfoList.push(nowstandinfo)
                 this.sarAccessInfoList[this.sarAccessInfoList.length - 1].uuid = this.number
                 this.number++
-                this.isSubmit = false
                 this.$message.success('添加成功')
+                this.isSubmit = false
               } else {
                 this.sarAccessInfoList.map((item, index) => {
                   if (item.uuid === nowstandinfo.uuid) {
@@ -1678,7 +1742,7 @@ export default {
       this.$nextTick(() => {
         this.sarAccessEO.type = accessRow.type
         this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
-        this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
+        // this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
         this.sarAccessEO.detailedListName = accessRow.detailedListName
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''
@@ -1768,4 +1832,4 @@ export default {
     margin: 2px;
   }
 }
-</style>
+</style>

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -26,13 +26,13 @@
                 title="下载"
                 @click="downloadFile(item.id)"
                 class="icon-download"
-                v-btn-permission="'E5QPKLR9CFVXTV64N32C'"
+                v-btn-permission="''"
               />
               <i
                 title="下载带水印"
                 @click="downloadFileByWater(item.id,item.name)"
                 class="icon-download2"
-                v-btn-permission="'43MBNPD59L2VYEQH4DSL'"
+                v-btn-permission="''"
               />
             </p>
           </div>
@@ -452,6 +452,7 @@ export default {
     },
     // 请求上传的文件信息
     getFileInfo() {
+      console.log(this.sarAccessEO)
       this.$http.get("att/attFile/getMultiFileInfos", {
         fileIds: this.sarAccessEO.relateFile
       }, {
@@ -564,6 +565,7 @@ export default {
   mounted() {
     this.$nextTick(() => {
       let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
+      console.log(accessRow)
       this.pageId = accessRow.id
       this.sarAccessEO = accessRow;
       this.selectInfobyAccid();

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -13,7 +13,7 @@
             <el-form-item label="清单类别" prop="detailedList" class="search-item">
               <el-input v-model="sarAccessEO.detailedList" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
-            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
+<!--            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
               <el-select
                 v-model="sarAccessEO.applicationScope"
                 multiple
@@ -30,7 +30,7 @@
                 >
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item>-->
             <br/><br/>
             <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
               <el-input
@@ -322,25 +322,78 @@
         </el-table-column>
         <el-table-column
           prop="issueTime"
-          sortable
+          align="center"
-          label="发布日期">
+          width="180px"
+          label="英文名称">
         </el-table-column>
         <el-table-column
-          prop="xcxssrq"
+          prop="issueTime"
+          align="center"
+          width="180px"
+          label="适用车型">
+        </el-table-column>
+        <el-table-column
+          prop="issueTime"
+          align="center"
+          width="180px"
+          label="能源类型">
+        </el-table-column>
+        <el-table-column
+          prop="issueTime"
           sortable
-          label="新车型实施日期">
+          align="center"
+          width="210px"
+          label="标准实施日期">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="zccssrq"
           sortable
+          width="210px"
+          align="center"
           label="在产车实施日期">
         </el-table-column>
+        <el-table-column
+          prop="XCXSSRQ"
+          sortable
+          align="center"
+          width="210px"
+          label="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="zccssrq"
+          width="210px"
+          align="center"
+          label="责任部门">
+        </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="textStatus"
-          width="120px"
+          width="180px"
-          label="文本状态">
+          align="center"
+          label="适用产品线">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          width="210px"
+          align="center"
+          label="乘用车VPPS中文名称">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          align="center"
+          width="210px"
+          label="卡车VPPS编码">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          align="center"
+          width="210px"
+          label="卡车VPPS中文名称">
         </el-table-column>
         <el-table-column>
           <template slot-scope="scope">
@@ -469,7 +522,7 @@ export default {
         type: '',
         relateFile: '',
         remark: '', // 清单说明
-        applicationScope: '' //适用领域
+        // applicationScope: '' //适用领域
       },
       fileInfoList: [], // 上传的附件
       uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
@@ -510,7 +563,7 @@ export default {
       sarAccessInfoSearch: {
         id: '',
         countryArea: '', // 国家
-        applicationScope: '', //适用区域
+        // applicationScope: '', //适用区域
         keywords: '', // 关键字
         detailedListName: '', //清单名称
         applyArctic: '', // 能源种类
@@ -1107,7 +1160,7 @@ export default {
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = JSON.stringify(rowlist)
           // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
-          sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
+          // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
           if (this.fileInfoList.length > 0) {
             let relateFile = []
@@ -1125,6 +1178,7 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
+                this.$message.success('新增成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1139,6 +1193,7 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
+                this.$message.success('编辑成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1669,7 +1724,7 @@ export default {
       this.$nextTick(() => {
         this.sarAccessEO.type = accessRow.type
         this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
-        this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
+        // this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
         this.sarAccessEO.detailedListName = accessRow.detailedListName
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -13,7 +13,7 @@
             <el-form-item label="项目名称" prop="projectName" class="search-item">
               <el-input v-model="sarAccessEO.projectName" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
-            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
+<!--            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
               <el-select
                 v-model="sarAccessEO.applicationScope"
                 multiple
@@ -30,7 +30,7 @@
                 >
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item>-->
             <br/><br/>
             <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
               <el-input
@@ -322,25 +322,78 @@
         </el-table-column>
         <el-table-column
           prop="issueTime"
-          sortable
+          align="center"
-          label="发布日期">
+          width="180px"
+          label="英文名称">
         </el-table-column>
         <el-table-column
-          prop="xcxssrq"
+          prop="issueTime"
+          align="center"
+          width="180px"
+          label="适用车型">
+        </el-table-column>
+        <el-table-column
+          prop="issueTime"
+          align="center"
+          width="180px"
+          label="能源类型">
+        </el-table-column>
+        <el-table-column
+          prop="issueTime"
           sortable
-          label="新车型实施日期">
+          align="center"
+          width="210px"
+          label="标准实施日期">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="zccssrq"
           sortable
+          width="210px"
+          align="center"
           label="在产车实施日期">
         </el-table-column>
+        <el-table-column
+          prop="XCXSSRQ"
+          sortable
+          align="center"
+          width="210px"
+          label="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="zccssrq"
+          width="210px"
+          align="center"
+          label="责任部门">
+        </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="textStatus"
-          width="120px"
+          width="180px"
-          label="文本状态">
+          align="center"
+          label="适用产品线">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          width="210px"
+          align="center"
+          label="乘用车VPPS中文名称">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          align="center"
+          width="210px"
+          label="卡车VPPS编码">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          align="center"
+          width="210px"
+          label="卡车VPPS中文名称">
         </el-table-column>
         <el-table-column>
           <template slot-scope="scope">
@@ -469,7 +522,7 @@ export default {
         type: '',
         relateFile: '',
         remark: '', // 清单说明
-        applicationScope: '' //适用领域
+        // applicationScope: '' //适用领域
       },
       fileInfoList: [], // 上传的附件
       uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
@@ -479,7 +532,8 @@ export default {
           {required: true, message: '国内/海外不能为空', trigger: 'change'}
         ],
         projectName: [
-          {required: true, message: '项目名称不能为空', trigger: 'change'}
+          {required: true, message: '项目名称不能为空', trigger: 'blur'},
+          {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
         ],
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
@@ -510,7 +564,7 @@ export default {
       sarAccessInfoSearch: {
         id: '',
         countryArea: '', // 国家
-        applicationScope: '', //适用区域
+        // applicationScope: '', //适用区域
         keywords: '', // 关键字
         detailedListName: '', //清单名称
         applyArctic: '', // 能源种类
@@ -1108,7 +1162,7 @@ export default {
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = JSON.stringify(rowlist)
           // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
-          sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
+          // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
           if (this.fileInfoList.length > 0) {
             let relateFile = []
@@ -1126,6 +1180,7 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
+                this.$message.success('新增成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1140,6 +1195,7 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
+                this.$message.success('编辑成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1670,7 +1726,7 @@ export default {
       this.$nextTick(() => {
         this.sarAccessEO.type = accessRow.type
         this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
-        this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
+        // this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
         this.sarAccessEO.detailedListName = accessRow.detailedListName
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -206,10 +206,13 @@
               sortable="custom"
               width="120px"
               label="文本状态">
-              <template slot="header" slot-scope="scope">
+<!--              <template slot="header" slot-scope="scope">-->
-                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">
+<!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
-                  <span>文本状态<i class="el-icon-warning-outline"></i></span>
+<!--                  <span>文本状态<i class="el-icon-warning-outline"></i></span>-->
-                </el-tooltip>
+<!--                </el-tooltip>-->
+<!--              </template>-->
+              <template slot-scope="scope">
+                <span>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="50" fixed="right">
@@ -353,7 +356,7 @@
                       </el-select>
                   </el-form-item>
                   <el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
-                                prop="standState" label-width="150px" class="add-form-item">
+                                prop="textStatus" label-width="150px" class="add-form-item">
                       <template slot="label">文本状态<i class="el-icon-warning-outline"></i></template>
                       <el-select v-model="sarStandardsInfoEO.textStatus"
                                  placeholder="请选择文本状态"
@@ -489,7 +492,7 @@
                         </el-form-item>
                     </template>
                     <template v-else-if="field.attrField === 'CYCVPPSCN'">
-                        <el-form-item label="关联模块--乘用车vpps中文名称" label-width="150px" prop="cycvppscn" class="add-form-item">
+                        <el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" label-width="150px" prop="cycvppscn" class="add-form-item">
                             <el-input
                                     v-model="sarStandardsInfoEO.CYCVPPSCN" disabled
                                     clearable
@@ -497,7 +500,7 @@
                         </el-form-item>
                     </template>
                     <template v-else-if="field.attrField === 'KCCVPPSCN'">
-                        <el-form-item label="关联模块--卡车vpps中文名称" label-width="150px" prop="kccvppscn" class="add-form-item">
+                        <el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" label-width="150px" prop="kccvppscn" class="add-form-item">
                             <el-input
                                     v-model="sarStandardsInfoEO.KCCVPPSCN" disabled
                                     clearable
@@ -536,7 +539,7 @@
                     :key="field.attrField"
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
-                    :disabled="formdisableflag"
+                    :disabled="field.attrName === '在产车实施日期(国家）' || field.attrName === '新车型实施日期(国家）'|| field.attrName === '实施日期(国际）' || formdisableflag"
                   ></custom-date-pick>
                 </template>
                 <template v-else-if="field.attrType === 'FILE'">
@@ -648,6 +651,9 @@
             label="文本状态"
             width="130"
             align="center">
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
           </el-table-column>
         </el-table>
         <!--分页-->
@@ -847,6 +853,9 @@
                 label="文本状态"
                 width="200"
                 align="center">
+                <template slot-scope="scope">
+                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                </template>
               </el-table-column>
             </el-table>
           </div>
@@ -1542,6 +1551,12 @@ export default {
         standSort: [
           {required: true, message: '标准类别不能为空', trigger: 'change'}
         ],
+        standNature: [
+          {required: true, message: '标准性质不能为空', trigger: 'change'}
+        ],
+        textStatus: [
+          {required: true, message: '文本状态不能为空', trigger: 'change'}
+        ],
         standNumber: [
           {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
           {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
@@ -1717,7 +1732,8 @@ export default {
       orgData: [],
       delLoading: false,
       standState: '',
-      orderBy :''
+      orderBy :'',
+      textStatusMap: {} // 文本状态id与name对应
     }
   },
   methods: {
@@ -2123,7 +2139,8 @@ export default {
       },
 
       remove(node, data) {
-          this.$confirm('是否删除菜单?', '提示', {
+        //通过 stahndinfoList 是否有数据进行判断
+          this.$confirm(this.stahndinfoList.length > 0 ? '该节点下有记录，是否删除？' : '是否删除菜单', '提示', {
               confirmButtonText: '确定',
               confirmButtonClass: 'common-button-primary',
               cancelButtonText: '取消',
@@ -4012,6 +4029,13 @@ export default {
             break
         }
       }
+    },
+    // 将文本状态的id与name对应
+    setMap(data){
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label)
+      })
+      console.log(this.textStatusMap, '文本状态的值')
     }
   },
   computed: {
@@ -4062,6 +4086,8 @@ export default {
         this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
         this.txlbOptions = res.data.TXLBCLASS // 体系类别
       this.getGzzOption()
+      this.setMap(this.standStateOptions)
+      console.log(this.standStateOptions, '文本状态')
     }, e => {
     })
     this.getDomesticStandardTable(this.tableFlag)

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -77,19 +77,18 @@
                 <el-form-item class="search-item btn-box">
                   <el-button
                     :loading="searching"
-                    icon="el-icon-search"
                     type="primary"
                     class="common-button-primary"
                     size="mini"
                     v-btn-permission="'366c89d1c54465faca96aaed26a158b1'"
                     @click="searchBtnClick(standCommonlySearch)">
+                    查询
                   </el-button>
                   <el-button
                     class="common-button-default"
-                    icon="el-icon-refresh-left"
                     size="mini"
                     v-btn-permission="'31ac9f600d8a3072ba088f1c106df359'"
-                    @click="clearAllSearch('standCommonlySearch')"></el-button>
+                    @click="clearAllSearch('standCommonlySearch')">清空</el-button>
                   <el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn"><i class="iconfont" v-btn-permission="'c9390928e5a3107956c7d43d8bde5cba'">&#xe7a5;</i>高级查询</el-button>
                 </el-form-item>
               </el-form>
@@ -198,14 +197,17 @@
               </template>
             </el-table-column>
             <el-table-column
-              prop="standStateShow"
+              prop="textStatus"
               sortable="custom"
               width="120px"
-              label="标准状态">
+              label="文本状态">
-              <template slot="header" slot-scope="scope">
+<!--              <template slot="header" slot-scope="scope">-->
-                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">
+<!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
-                  <span>标准状态 <i class="el-icon-warning-outline"></i></span>
+<!--                  <span>文本状态 <i class="el-icon-warning-outline"></i></span>-->
-                </el-tooltip>
+<!--                </el-tooltip>-->
+<!--              </template>-->
+              <template slot-scope="scope">
+                <span>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="50" fixed="right">
@@ -697,10 +699,13 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="standStateShow"
+            prop="textStatus"
-            label="标准状态"
+            label="文本状态"
             width="130"
             align="center">
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
           </el-table-column>
         </el-table>
         <!--分页-->
@@ -895,10 +900,13 @@
                 </template>
               </el-table-column>
               <el-table-column
-                prop="standStateShow"
+                prop="textStatus"
-                label="标准状态"
+                label="文本状态"
                 width="200"
                 align="center">
+                <template slot-scope="scope">
+                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                </template>
               </el-table-column>
             </el-table>
           </div>
@@ -1094,6 +1102,7 @@ export default {
   },
   data () {
     return {
+      textStatusMap: {}, // 文本状态id与name对应
       treeList: [],
       props: {
         label: 'menuName',
@@ -1713,6 +1722,13 @@ export default {
   watch: {
   },
   methods: {
+    // 将文本状态的id与name对应
+    setMap(data){
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label)
+      })
+      console.log(this.textStatusMap, '文本状态的值')
+    },
       popoverHideBusVs (checkedIds, checkedData) {
           if(checkedData){
               this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code
@@ -3945,6 +3961,7 @@ export default {
       this.categoryConfigOptions = res.data.CATEGORY
       this.standAttributeList = res.data.RULETYPE
       this.getGzzOption()
+      this.setMap(this.standStateOptions)
     }, e => {
     })
     this.getDomesticStandardTable()

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -42,20 +42,24 @@
                   <el-table-column
                           prop="partCode"
                           label="章节编号"
+                          align="center"
                           width="180">
                   </el-table-column>
                   <el-table-column
                           prop="content"
+                          align="center"
                           label="修改意见内容(包括理由或依据)"
                   >
                   </el-table-column>
                   <el-table-column
                           prop="deptName"
+                          align="center"
                           label="提出部门"
                   >
                   </el-table-column>
                   <el-table-column
                           prop="userName"
+                          align="center"
                           label="提出人"
                   >
                   </el-table-column>