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

src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrDetails.vue

@@ -26,14 +26,14 @@
       </div>
       <div class="right">
         <el-button class="common-button-primary add-button"
-                   v-btn-permission="'8969811dc465528909628a3a13529023'"
+                   v-btn-permission="''"
                    type="primary"
                    icon="add"
                    size="small"
                    v-if="dictionaryId != 'ERDFGHGGJJ' && dictionaryId != 'D975E8V5KVQUY3DZFV7E' && dictionaryId != 'WQERWC39J4E8SV6WREP2'"
                    @click="productAdd">新增</el-button>
         <el-button class="common-button-default delete-button"
-                   v-btn-permission="'df889d64e87c977e4bc9f9a0851d4c27'"
+                   v-btn-permission="''"
                    v-if="dictionaryId != 'ERDFGHGGJJ' && dictionaryId != 'D975E8V5KVQUY3DZFV7E' && dictionaryId != 'WQERWC39J4E8SV6WREP2'"
                    icon="delete"
                    size="small"
@@ -85,8 +85,8 @@
                   <div v-if="relateDicId">
                     <el-dropdown-item :command="[scope.row, '查看']"  v-btn-permission="'AQCEYWZK8F4DL85BZPRB'">查看</el-dropdown-item>
                   </div>
-                  <el-dropdown-item :command="[scope.row, '编辑']"  v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '48723deaa90798f56e939aea6aa49a23' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'"  v-btn-permission="'27e0f6cdfb3e2af446c36f9923e90d76'">编辑</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']"  v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '48723deaa90798f56e939aea6aa49a23' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'"  v-btn-permission="''">编辑</el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']"  v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '982b2f92a26c3c91b6b868419f0e2d3b' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'"  v-btn-permission="'27e0f6cdfb3e2af446c36f9923e90d76'">删除</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '删除']"  v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '982b2f92a26c3c91b6b868419f0e2d3b' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'"  v-btn-permission="''">删除</el-dropdown-item>
                   <!--                    <el-dropdown-item :command="[scope.row, '流程']">流程</el-dropdown-item>-->
                 </el-dropdown-menu>
               </el-dropdown>

src/pages/details/otherStandardDetails/index.vue

@@ -56,7 +56,7 @@
                 </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>
-                <p><label style=" margin-right: 150px;">标准体系</label><span>{{ sarStandardsInfoEO.standSystemName || '-' }}</span></p>
+                <p v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准体系</label><span>{{ sarStandardsInfoEO.standSystemName || '-' }}</span></p>
                 <!--          <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
                 <!--          <p><label>重要度：</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>-->
                 <!--          <p><label>纳入标准法规清单的国家/地区：</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>-->
@@ -2624,8 +2624,6 @@ export default {
         // if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
         //   return
         // }
-        console.log("displayLocation");
-        console.log(displayLocation);
         displayLocation.forEach((location) => {
           location.isShowImp = '0'
           if (dynamicFormField) {

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

@@ -3,8 +3,8 @@
   <div class="release">
     <ul>
       <li v-for="item in standardReleaseList" :key="item.id" class="time-title">
-        <a class="title" :title="item.title">{{ item.title }}</a>
+        <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
-        <span class="time">{{ getDate(item.pubTime) }}</span>
+        <span class="time">{{ getDate(item.issueTime) }}</span>
       </li>
     </ul>
   </div>
@@ -28,6 +28,17 @@ export default {
     this.getAdvice()
   },
   methods: {
+    // 点击查看
+    handlePreview (item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.id,
+          pageType: item.standType + '_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
     //截取时间
     getDate (date) {
       return date != null ? date.substring(0, date.indexOf(' ')) : ''
@@ -37,7 +48,7 @@ export default {
       let obj = {}
       obj.msgType = 'RESOURCE'
       obj.rowLimit = 8
-      this.$http.get('lawss/msgDynamicInfo/page', obj, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', obj, {
         _this: this
       }, res => {
         this.standardReleaseList = res.data.list

src/pages/home1/index.vue

@@ -16,27 +16,29 @@
         <search-group></search-group>
         <div class="main-tabs">
           <div class="main-left-wrap">
+            <el-button type="text" class="more" @click="MORE">MORE</el-button>
             <el-tabs
-              v-model="activeName"
+                v-model="activeName"
-              class="home-tabs"
+                class="home-tabs"
-              @tab-click="handleTabClick"
+                @tab-click="handleTabClick"
-            >
+              >
-<!--              <el-tab-pane label="外部会议资料" name="conferenceMaterials">-->
+                <!--              <el-tab-pane label="外部会议资料" name="conferenceMaterials">-->
-<!--                <conference-materials></conference-materials>-->
+                <!--                <conference-materials></conference-materials>-->
-<!--              </el-tab-pane>-->
+                <!--              </el-tab-pane>-->
-<!--              <el-tab-pane label="会议通知" name="noticeOfMeeting">-->
+                <!--              <el-tab-pane label="会议通知" name="noticeOfMeeting">-->
-<!--               <notice-of-meeting></notice-of-meeting>-->
+                <!--               <notice-of-meeting></notice-of-meeting>-->
-<!--              </el-tab-pane>-->
+                <!--              </el-tab-pane>-->
-              <el-tab-pane label="标准征求意见" name="solicitOpinions">
+                <el-tab-pane label="标准征求意见" name="solicitOpinions">
-                <solicitOpinions></solicitOpinions>
+                  <solicitOpinions></solicitOpinions>
-              </el-tab-pane>
+                </el-tab-pane>
-<!--              <el-tab-pane label="标准发布" name="release">-->
+                <el-tab-pane label="标准发布" name="release">
-<!--                <release></release>-->
+                  <release></release>
-<!--              </el-tab-pane>-->
+                </el-tab-pane>
-<!--              <el-tab-pane label="外部资讯" name="realTimeInfo">-->
+                <!--              <el-tab-pane label="外部资讯" name="realTimeInfo">-->
-<!--                <realTimeInfo></realTimeInfo>-->
+                <!--                <realTimeInfo></realTimeInfo>-->
-<!--              </el-tab-pane>-->
+                <!--              </el-tab-pane>-->
-            </el-tabs>
+              </el-tabs>
+
           </div>
         </div>
       </div>
@@ -106,6 +108,9 @@ export default {
         }, e => {})
       }).catch(() => {
       })
+    },
+    MORE() {
+      this.$router.push({name: 'standardForComments'})
     }
   },
 }
@@ -172,8 +177,20 @@ export default {
       width: 60vw;
       height: 100%;
       margin-right: 10px;
+      .more {
+        float: right;
+        color: #FFFFFF;
+        margin: 0px 15px;
+        &:hover {
+          color: red;
+          cursor: pointer;
+        }
+      }
       .home-tabs {
         margin-left: 2.34vw;
+        ::v-deep.el-tabs__header{
+          margin: 0 70px 15px 0px
+        }
         ::v-deep {
           .el-tabs__item {
             font-size: 16px;

src/pages/localTool/standAutoSplit/index.vue

@@ -28,8 +28,8 @@
     </table-tools-bar>
     <div class="content">
       <div class="action-bar">
-        <el-button size="mini"  @click="spiltStandFile" v-btn-permission="''"><i class="iconfont"></i>拆分</el-button>
+        <el-button size="small" type="primary" @click="spiltStandFile" v-btn-permission="''">拆分</el-button>
-        <el-button size="mini"  @click="batchDelete" v-btn-permission="''"><i class="iconfont">&#xe61b;</i>删除</el-button>
+        <el-button size="small" type="danger" @click="batchDelete" v-btn-permission="''">删除</el-button>
       </div>
       <div class="table-wrap">
         <div style="position: absolute;height: 100%;width: 100%;">
@@ -542,16 +542,17 @@
             </el-formItem>
             <el-form-item class="search-item btn-box">
               <el-button
-                icon="el-icon-search"
+                size="mini"
                 type="primary"
                 class="common-button-primary"
                 @click="getSearchSarBussStandPage">
+                搜索
               </el-button>
               <el-button
                 class="common-button-default"
-                icon="el-icon-refresh-left"
+                size="mini"
                 @click="handleResetCondition()"
-              ></el-button>
+              >清空</el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -594,11 +595,11 @@
               <a @click="showLawsDetails(scope.row)">{{ scope.row.lawsName }}</a>
             </template>
           </el-table-column>
-<!--          <el-table-column-->
+<!--          <el-table-column
-<!--            prop="stateName"-->
+            prop="fileType"
-<!--            align="center"-->
+            align="center"
-<!--            label="文本状态">-->
+            label="文本状态">
-<!--          </el-table-column>-->
+          </el-table-column>-->
 <!--          <el-table-column-->
 <!--            prop="putTime"-->
 <!--            label="新车型实施日期"-->
@@ -931,7 +932,7 @@ export default {
         _this: this
       }, res => {
         this.addSpiltStandList = res.data.list
-        this.addFileStandtotal = res.data.count
+        this.addFileStandtotal = res.data.list.length
         this.loadData = false
       }, e => {
         this.loadData = false
@@ -1359,10 +1360,7 @@ export default {
         name: 'ItemSplitInfo',
         query: {
           infoId: row.id,
-          // standNumSplit: row.standNumSplit === null ? row.showNumber : row.standNumSplit,
-          // standNameSplit: row.standNameSplit === null ? row.standName : row.standNameSplit,
           result: row.result,
-          // fileType: row.fileType
         }
       })
     },

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

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

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

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

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

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

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

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

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

@@ -490,7 +490,7 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.nylx" placeholder="请选择适用车型" multiple>
+                                    <el-select v-model="form.nylx" placeholder="请选择能源类型" multiple>
                                         <el-option
                                                 v-for="item in categoryOptions"
                                                 placeholder="请选择"
@@ -532,11 +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-input
+                                    <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
-                                            v-model="form.qcdw"
+                                        <el-option
-                                            placeholder="请选择起草单位"
+                                                v-for="item in qcdwOptions"
-                                            clearable
+                                                placeholder="请选择"
-                                    ></el-input>
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
@@ -552,7 +556,7 @@
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.sycpx" placeholder="请选择适用车型" multiple>
+                                    <el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple>
                                         <el-option
                                                 v-for="item in sycpxOptions"
                                                 placeholder="请选择"
@@ -743,7 +747,7 @@
                                 </el-form-item>
                             </el-card>
                         </el-timeline-item>
-                        <el-timeline-item timestamp="选择会签责任人" prop="zrUserName" placement="top" :color="roleForm.zrUserName ? '#66b1ff' : ''">
+                        <el-timeline-item timestamp="选择会签责任人" v-if="form.signFlag === '1'" prop="zrUserName" placement="top" :color="roleForm.zrUserName ? '#66b1ff' : ''">
                             <el-card>
                                 <el-form-item prop="zrUserName" style="margin-bottom: 0">
                                     <h4>会签责任人</h4>
@@ -1331,6 +1335,8 @@
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
+                wssmrOptions: [], // 我司署名人
+                qcdwOptions: [], // 起草单位
                 sycpxOptions: [], // 适用产品线
                 zrbmOptions: [], // 责任部门
                 zrgcsOptions: [], // 责任工程师
@@ -1859,6 +1865,9 @@
                     }else if(this.fileType === 'ca'){
                         this.form.ca = response.data.id;
                         this.form.caName = response.data.name;
+                    }else if(this.fileType === 'zbjbd'){
+                        this.form.zbjbd = response.data.id;
+                        this.form.zbjbdName = response.data.name;
                     }
                     this.$message({
                         showClose: true,
@@ -1943,6 +1952,7 @@
                     if (valid) {
                         this.$refs['userForm'].validate((valid) => {
                             if (valid) {
+                                this.isSubmit = true
                                 var json = Object.assign(this.form, this.roleForm)
                                 json.zrUserId = this.form.zrUserId
                                 json.jlUserId = this.form.jlUserId
@@ -1963,6 +1973,7 @@
                                         }, res => {
                                             if (res.success) {
                                                 this.$message.success(res.message)
+                                                this.isSubmit = false
                                             }
                                         })
                                     }
@@ -2006,6 +2017,8 @@
                 this.categoryOptions = res.data.NYLXCLASS // 能源类型
                 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
                 this.cysdOptions = res.data.WSCYSD // 我司参与深度
+                this.wssmrOptions = res.data.WSSMR // 我司署名人
+                this.qcdwOptions = res.data.QCDW // 我司署名人
                 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师

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

@@ -315,7 +315,7 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.nylx" placeholder="请选择适用车型" multiple disabled>
+                                    <el-select v-model="form.nylx" placeholder="请选择能源类型" multiple disabled>
                                         <el-option
                                                 v-for="item in categoryOptions"
                                                 placeholder="请选择"
@@ -361,12 +361,15 @@
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                                    <el-input
+                                    <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
-                                            disabled
+                                        <el-option
-                                            v-model="form.qcdw"
+                                                v-for="item in qcdwOptions"
-                                            placeholder="请选择起草单位"
+                                                placeholder="请选择"
-                                            clearable
+                                                :key="item.value"
-                                    ></el-input>
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
@@ -382,7 +385,7 @@
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.sycpx" placeholder="请选择适用车型" multiple disabled>
+                                    <el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple disabled>
                                         <el-option
                                                 v-for="item in sycpxOptions"
                                                 placeholder="请选择"
@@ -437,8 +440,13 @@
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
-                                        <el-option label="署名人1" value="1"></el-option>
+                                        <el-option
-                                        <el-option label="署名人2" value="2"></el-option>
+                                                v-for="item in wssmrOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -811,6 +819,8 @@
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
+                wssmrOptions: [], // 我司署名人
+                qcdwOptions: [], // 起草单位
                 sycpxOptions: [], // 适用产品线
                 zrbmOptions: [], // 责任部门
                 zrgcsOptions: [], // 责任工程师
@@ -943,6 +953,7 @@
             },
             handleSave() {},
             handleSubmit() {
+                this.isSubmit = true
                 this.form.commentText = this.commentText
                 this.form.approvalOpinion = this.approvalOpinion
                 const json = JSON.stringify(this.form);
@@ -957,6 +968,7 @@
                     if (res.success) {
                         if(this.approvalOpinion === '1'){
                             this.$message.warning("驳回成功")
+                            this.isSubmit = false
                         }else{
                             this.processCreateStand(json)
                         }
@@ -980,8 +992,10 @@
                                 name: 'ProcessCenter'
                             })
                         }, 100)
+                        this.isSubmit = false
                     } else {
                         this.$message.warning(res.message)
+                        this.isSubmit = false
                     }
                 })
             },
@@ -1002,6 +1016,8 @@
                 this.categoryOptions = res.data.NYLXCLASS // 能源类型
                 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
                 this.cysdOptions = res.data.WSCYSD // 我司参与深度
+                this.wssmrOptions = res.data.WSSMR // 我司署名人
+                this.qcdwOptions = res.data.QCDW // 起草单位
                 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师

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

@@ -308,7 +308,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.nylx" placeholder="请选择适用车型" multiple disabled>
+                  <el-select v-model="form.nylx" placeholder="请选择能源类型" multiple disabled>
                     <el-option
                         v-for="item in categoryOptions"
                         placeholder="请选择"
@@ -354,12 +354,15 @@
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                  <el-input
+                    <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
-                      disabled
+                        <el-option
-                      v-model="form.qcdw"
+                                v-for="item in qcdwOptions"
-                      placeholder="请选择起草单位"
+                                placeholder="请选择"
-                      clearable
+                                :key="item.value"
-                  ></el-input>
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                   <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
@@ -375,7 +378,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.sycpx" placeholder="请选择适用车型" multiple disabled>
+                  <el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple disabled>
                     <el-option
                         v-for="item in sycpxOptions"
                         placeholder="请选择"
@@ -430,8 +433,13 @@
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
-                    <el-option label="署名人1" value="1"></el-option>
+                      <el-option
-                    <el-option label="署名人2" value="2"></el-option>
+                              v-for="item in wssmrOptions"
+                              placeholder="请选择"
+                              :key="item.value"
+                              :value="item.value"
+                              :label="item.label"
+                      ></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -803,6 +811,8 @@ export default {
       categoryOptions: [], // 能源类型
       applyAuthOptions: [], // 适用认证
       cysdOptions: [], // 我司参与深度
+      wssmrOptions: [], // 我司署名人
+      qcdwOptions: [], // 起草单位
       sycpxOptions: [], // 适用产品线
       zrbmOptions: [], // 责任部门
       zrgcsOptions: [], // 责任工程师
@@ -935,10 +945,10 @@ export default {
     },
     handleSave() {},
     handleSubmit() {
+      this.isSubmit = false
       this.form.commentText = this.commentText
       this.form.approvalOpinion = this.approvalOpinion
       const json = JSON.stringify(this.form);
-      console.log(json)
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId : this.userId,
@@ -951,6 +961,7 @@ export default {
         }else {
             this.$message.success(res.message)
         }
+        this.isSubmit = false
       })
     },
 
@@ -993,6 +1004,8 @@ export default {
       this.categoryOptions = res.data.NYLXCLASS // 能源类型
       this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
       this.cysdOptions = res.data.WSCYSD // 我司参与深度
+      this.wssmrOptions = res.data.WSSMR // 我司署名人
+      this.qcdwOptions = res.data.QCDW // 起草单位
       this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师

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

@@ -477,7 +477,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.nylx" placeholder="请选择适用车型" multiple>
+                  <el-select v-model="form.nylx" placeholder="请选择能源类型" multiple>
                     <el-option
                         v-for="item in categoryOptions"
                         placeholder="请选择"
@@ -519,11 +519,15 @@
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                  <el-input
+                    <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
-                      v-model="form.qcdw"
+                        <el-option
-                      placeholder="请选择起草单位"
+                                v-for="item in qcdwOptions"
-                      clearable
+                                placeholder="请选择"
-                  ></el-input>
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                   <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
@@ -539,7 +543,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.sycpx" placeholder="请选择适用车型" multiple>
+                  <el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple>
                     <el-option
                         v-for="item in sycpxOptions"
                         placeholder="请选择"
@@ -594,8 +598,13 @@
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
-                    <el-option label="署名人1" value="1"></el-option>
+                      <el-option
-                    <el-option label="署名人2" value="2"></el-option>
+                              v-for="item in wssmrOptions"
+                              placeholder="请选择"
+                              :key="item.value"
+                              :value="item.value"
+                              :label="item.label"
+                      ></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -1173,6 +1182,8 @@ export default {
       categoryOptions: [], // 能源类型
       applyAuthOptions: [], // 适用认证
       cysdOptions: [], // 我司参与深度
+      wssmrOptions: [], // 我司署名人
+      qcdwOptions: [], // 起草单位
       sycpxOptions: [], // 适用产品线
       zrbmOptions: [], // 责任部门
       zrgcsOptions: [], // 责任工程师
@@ -1542,6 +1553,7 @@ export default {
     handleSubmit() {
       this.$refs['form'].validate((valid) => {
           if (valid) {
+            this.isSubmit = true
             this.form.commentText = this.commentText
             this.form.approvalOpinion = this.approvalOpinion
             const json = JSON.stringify(this.form);
@@ -1557,6 +1569,7 @@ export default {
               }else {
                 this.$message.success(res.message)
               }
+                this.isSubmit = false
             })
           }
       })
@@ -1600,6 +1613,8 @@ export default {
       this.categoryOptions = res.data.NYLXCLASS // 能源类型
       this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
       this.cysdOptions = res.data.WSCYSD // 我司参与深度
+      this.wssmrOptions = res.data.WSSMR // 我司署名人
+      this.qcdwOptions = res.data.QCDW // 起草单位
       this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师

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

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

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

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

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

@@ -65,7 +65,7 @@
         <div class="tableTitle">
           <div class="tableButton">
             <el-button plain class="common-button-primary" size="mini" @click="addList">新增</el-button>
-            <el-button plain class="common-button-primary" size="mini" @click="addList">批量删除</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
           </div>
         </div>
         <el-table
@@ -163,6 +163,41 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+<!--            <div class="left">-->
+<!--              <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" style="margin-left:10px">-->
+<!--                <el-form-item label="标准号" class="search-item search-item-last">-->
+<!--                  <el-input-->
+<!--                    v-model="sarSarAccessEOSearch.standName"-->
+<!--                    placeholder="请输入标准号"-->
+<!--                  ></el-input>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="标准名称" class="search-item search-item-last">-->
+<!--                  <el-input-->
+<!--                    v-model="sarSarAccessEOSearch.standNumber"-->
+<!--                    placeholder="请输入标准名称"-->
+<!--                  ></el-input>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item class="search-item btn-box">-->
+<!--                  <el-button-->
+<!--                    :loading="searching"-->
+<!--                    type="primary"-->
+<!--                    class="common-button-primary"-->
+<!--                    size="small"-->
+<!--                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"-->
+<!--                    @click="getStandData">-->
+<!--                    查询-->
+<!--                  </el-button>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item class="search-item btn-box">-->
+<!--                  <el-button-->
+<!--                    class="common-button-default"-->
+<!--                    size="small"-->
+<!--                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"-->
+<!--                    @click="clearSearch">清空-->
+<!--                  </el-button>-->
+<!--                </el-form-item>-->
+<!--              </el-form>-->
+<!--            </div>-->
             <el-table
               :data="sarAccessListDatas"
               tooltip-effect="dark"
@@ -344,6 +379,14 @@ export default {
       standList: [], //新添加的标准
       modalshowflag: false, // drawer开关
       drawerTitle: "", //drawer标题
+      // 查询相关参数
+      searching: false,
+      sarSarAccessEOSearch: {
+        standName:'',
+        standNumber:'',
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent
+      },
       nodeList: [],
       defaultProps: {
         children: "children",
@@ -386,6 +429,7 @@ export default {
       },
       ListModel: false, //选择拆分标准抽屉状态
       treeData: [], // 人员数据
+      selectList: [], //选择标准的选择框
       isSubmit: false,
       saveLoading: false,
       selectedList: [],  //拆分标准的选择框
@@ -497,6 +541,32 @@ export default {
     addList() {
       this.standModel = true;
     },
+    // 点击批量删除事件
+    deleteList() {
+      console.log(this.selectList.length);
+       if(this.selectList.length < 1){
+         this.$message.warning('请选择一条数据进行删除')
+       }else {
+          this.$confirm('您确认删除这些数据？', '提示', {
+            confirmButtonText: "确认",
+            confirmButtonClass: "common-button-primary",
+            cancelButtonText: "取消",
+            type: "warning"
+          }). then(() => {
+            this.selectList.map(item => {
+              let index;
+            index =  this.dataList.findIndex(items => {
+                return items.productLine = item
+              })
+              if (index > -1) {
+                this.dataList.splice(index, 1);
+              }
+            });
+            this.selectList = [];
+          }).catch(() => {
+          })
+       }
+    },
     //取消添加事件
     cancelStand() {
       this.standModel = false;
@@ -590,6 +660,7 @@ export default {
         }, {
           _this: this
         }, res => {
+          console.log(res.data);
           this.listForm.breakdownList = res.data;
           this.ListModel = false;
         }, e => {
@@ -609,7 +680,7 @@ export default {
     selectStandChange(data) {
       this.selectList = [];
       for (let i = 0; i < data.length; i++) {
-        this.selectList.push(data[i].id);
+        this.selectList.push(data[i].productLine);
       }
     },
     //添加产品线select的改变
@@ -655,7 +726,7 @@ export default {
       }, {
         _this: this
       }, res => {
-        this.productData = res.data;
+        this.productData = res.data.records;
         this.totalNo = res.data.total;
       }, e => {
 
@@ -663,20 +734,24 @@ export default {
     },
     //获取标准数据
     getStandData() {
-      console.log(this.page);
-      console.log(this.pageSize);
       this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
         page: this.page,
         pageSize: this.pageSize,
       }, {
         _this: this
       }, res => {
-        console.log(res.data);
         this.sarAccessListDatas = res.data.list;
         this.total = res.data.count;
       }, e => {
       });
-    }
+    },
+    clearSearch() {
+      this.sarSarAccessEOSearch = {
+        standName: "",
+        standNumber: ""
+      };
+      this.getStandData();
+    },
   },
   computed: {},
   mounted() {

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -462,7 +462,7 @@ export default {
       // 新增、编辑 基础信息字段
       sarAccessEO: {
         id: '',
-        sortKey: 1,
+        sortKey: 4,
         detailedList: '',
         detailedListName: '',
         energyKind: '',

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

@@ -10,8 +10,8 @@
             <el-form-item label="清单名称" prop="detailedListName" class="search-item">
               <el-input v-model="sarAccessEO.detailedListName" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
-            <el-form-item label="项目名称" prop="detailedList" class="search-item">
+            <el-form-item label="项目名称" prop="projectName" class="search-item">
-              <el-input v-model="sarAccessEO.detailedList" :disabled="disabledFlag" placeholder="请输入"></el-input>
+              <el-input v-model="sarAccessEO.projectName" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
             <el-form-item label="适用领域" prop="applicationScope" class="search-item">
               <el-select
@@ -246,8 +246,8 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="detailedList"
+            prop="projectName"
-            label="国家/地区"
+            label="项目名称"
             align="center">
           </el-table-column>
           <el-table-column
@@ -462,8 +462,8 @@ export default {
       // 新增、编辑 基础信息字段
       sarAccessEO: {
         id: '',
-        sortKey: 1,
+        sortKey: 2,
-        detailedList: '',
+        projectName: '',
         detailedListName: '',
         energyKind: '',
         type: '',
@@ -478,8 +478,8 @@ export default {
         type: [
           {required: true, message: '国内/海外不能为空', trigger: 'change'}
         ],
-        detailedList: [
+        projectName: [
-          {required: true, message: '清单类别不能为空', trigger: 'change'}
+          {required: true, message: '项目名称不能为空', trigger: 'change'}
         ],
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
@@ -1097,6 +1097,7 @@ export default {
     },
     // 提交按钮 事件
     saveSarAccess () {
+      alert()
       this.$refs['sarAccessForm'].validate((valid) => {
         if (valid) {
           let rowlist = []

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -554,53 +554,7 @@
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
                     :disabled="formdisableflag"
-                  >1</custom-textarea>
+                  ></custom-textarea>
-                </template>
-                <template v-else-if="field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.selVal === 'ROLELIST'">
-                  <template v-if="field.attrField === 'XMPGJS'">
-                    <custom-role-tree
-                      :key="field.attrField"
-                      :config="field"
-                      v-model="sarStandardsInfoEO[field.attrField]"
-                      :disabled="formdisableflag"
-                      :data-model="sarStandardsInfoEO"
-                      :isRoleHierarchy="false"
-                      roleHierarchyName="VSE,FO,工程师"
-                    ></custom-role-tree>
-                  </template>
-                  <template v-else-if="field.attrField === 'ZRBM'">
-                    <custom-org
-                      :key="field.attrField"
-                      :config="field"
-                      :zNodes="orgData"
-                      v-model="sarStandardsInfoEO[field.attrField]"
-                      :disabled="formdisableflag"
-                      :data-model="sarStandardsInfoEO"
-                      @on-checked="onChecked"
-                    ></custom-org>
-                  </template>
-                  <template v-else-if="field.attrField === 'FGWHR'">
-                    <org-table
-                      :key="field.attrField"
-                      :config="field"
-                      :zNodes="orgData"
-                      v-model="sarStandardsInfoEO[field.attrField]"
-                      :disabled="formdisableflag"
-                      :data-model="sarStandardsInfoEO"
-                    ></org-table>
-                  </template>
-                  <template v-else>
-                    <custom-org
-                      :key="field.attrField"
-                      :config="field"
-                      :zNodes="orgData"
-                      v-model="sarStandardsInfoEO[field.attrField]"
-                      :disabled="formdisableflag"
-                      :data-model="sarStandardsInfoEO"
-                      :initNotCheck="false"
-                      @on-checked="onChecked"
-                    ></custom-org>
-                  </template>
                 </template>
                 <template v-else-if="field.attrType === 'SEL_OPTION'">
                   <template>
@@ -613,12 +567,14 @@
                   </template>
                 </template>
                 <template v-else-if="field.attrType === 'SEL_OPTS' && field.attrField !== 'ZRLX'">
-                  <custom-select-array
+                    <template>
-                      :key="field.attrField"
+                        <custom-select-array
-                      :config="field"
+                                :key="field.attrField"
-                      v-model="sarStandardsInfoEO[field.attrField]"
+                                :config="field"
-                      :disabled="formdisableflag"
+                                v-model="sarStandardsInfoEO[field.attrField]"
-                  ></custom-select-array>
+                                :disabled="formdisableflag"
+                        ></custom-select-array>
+                    </template>
                 </template>
               </template>
             </template>
@@ -1376,7 +1332,14 @@ export default {
           KCCVPPSCN: '',
           DYBXH: '',
           DYMC: '',
-
+          CYSD:'',
+          CLLX:'',
+          NYLX:'',
+          SYCPX:'',
+          SYRZ:'',
+          ZRBM:'',
+          ZRGCS:'',
+          WSSMR:'',
       }, // 标准新增过程中用到的对象
       standClass: [], // 标准类别
       sarStandardsInfoEO: {
@@ -1495,7 +1458,21 @@ export default {
         sentScreenFileFeedback: '',
         approvalFileTime: '',
         approvalFileFeedback: '',
-        certPutTimeList: []
+        certPutTimeList: [],
+          CYCVPPSBM: '',
+          CYCVPPSCN: '',
+          KCCVPPSBM: '',
+          KCCVPPSCN: '',
+          DYBXH: '',
+          DYMC: '',
+          CYSD:'',
+          CLLX:'',
+          NYLX:'',
+          SYCPX:'',
+          SYRZ:'',
+          ZRBM:'',
+          ZRGCS:'',
+          WSSMR:'',
       }, // 标准新增过程中用到的对象
       currentFileList: '', // 当前操作的是哪个FormItem的上传
       isList: [
@@ -1745,22 +1722,26 @@ export default {
   },
   methods: {
       popoverHideBusVs (checkedIds, checkedData) {
-          this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code
+        if(checkedData){
-          this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName
+            this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code
-          console.log(checkedData)
+            this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName
-          console.log(this.sarStandardsInfoEO.CYCVPPSBM)
+            this.$forceUpdate()
-          console.log(this.sarStandardsInfoEO.CYCVPPSCN)
+        }
-          this.$forceUpdate()
       },
       popoverHideCarVs (checkedIds, checkedData) {
-          this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code
+        if(checkedData){
-          this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName
+            this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code
-          this.$forceUpdate()
+            this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName
+            this.$forceUpdate()
+        }
+
       },
       popoverHideModel (checkedIds, checkedData) {
-          this.sarStandardsInfoEO.DYBXH = checkedData.model
+          if(checkedData){
-          this.sarStandardsInfoEO.DYMC = checkedData.name
+              this.sarStandardsInfoEO.DYBXH = checkedData.model
-          this.$forceUpdate()
+              this.sarStandardsInfoEO.DYMC = checkedData.name
+              this.$forceUpdate()
+          }
       },
       busVsFunc(){
           this.$http.get('sarVppsTree/list', '', {
@@ -1777,7 +1758,9 @@ export default {
           })
       },
       popoverHide (checkedIds, checkedData) {
-          this.sarStandardsInfoEO.standSystem = checkedData.id
+          if(checkedData){
+              this.sarStandardsInfoEO.standSystem = checkedData.id
+          }
       },
       closeModal () {
           this.productModal = false
@@ -2013,7 +1996,7 @@ export default {
         Promise.all([this.queryDisplayLocation()]).then((values) => {
           const [displayLocation] = values
           const formFieldList = this.formFieldList
-          this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
+            this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
           if(this.sarStandardsInfoEO.standSystem){
               this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
           }
@@ -2050,11 +2033,11 @@ export default {
               }
               field['value'] = value
               // 追加用户名称和部门名称和SVPPS名称
-              if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') {
+              // if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') {
-                let attrFieldName = field.attrField + 'Name'
+              //   let attrFieldName = field.attrField + 'Name'
-                valueName = dynamicFormField[attrFieldName]
+              //   valueName = dynamicFormField[attrFieldName]
-              }
+              // }
-              field['valueName'] = valueName
+              // field['valueName'] = valueName
               if (field.showRegionId === location.value) {
                 if (!location.child) {
                   location['child'] = []
@@ -2064,6 +2047,7 @@ export default {
             })
           })
           this.dynamicFormField = displayLocation
+            console.log(this.dynamicFormField)
           this.loading = false
         })
       })
@@ -2785,7 +2769,6 @@ export default {
             if (flag) {
               // 时间格式修改
               let nowstandinfo = JSON.parse(JSON.stringify(this.sarStandardsInfoEO))
-                console.log(nowstandinfo)
               if (nowstandinfo.putTime != null && nowstandinfo.putTime !== '') {
                 nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss')
               }
@@ -2815,8 +2798,6 @@ export default {
                 sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
               })
               nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
-                console.log(formFieldList)
-                console.log(nowstandinfo)
               this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, {
                 _this: this
               }, res => {
@@ -3731,9 +3712,51 @@ export default {
       const data = this.formFieldListData
       this.formFieldList = data.map((item) => {
         if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
-          return Object.assign({}, item, {
+            if(item.attrField === 'WSSMR'){
-            options: this.allSelectOptions[item.selVal]
+                return Object.assign({}, item, {
-          })
+                    options: this.allSelectOptions["WSSMR"]
+                })
+            }else if(item.attrField === 'QCDW'){
+                return Object.assign({}, item, {
+                    options: this.allSelectOptions["QCDW"]
+                })
+            }else if(item.attrField === 'CYSD'){
+                return Object.assign({}, item, {
+                    options: this.allSelectOptions["WSCYSD"]
+                })
+            }else if(item.attrField === 'CLLX'){
+                return Object.assign({}, item, {
+                    options: this.allSelectOptions["ENERGYTYPES"]
+                })
+            }else if(item.attrField === 'NYLX'){
+                return Object.assign({}, item, {
+                    options: this.allSelectOptions["NYLXCLASS"]
+                })
+            }else if(item.attrField === 'SYCPX'){
+                return Object.assign({}, item, {
+                    options: this.allSelectOptions["SYCPXCLASS"]
+                })
+            }else if(item.attrField === 'SYRZ'){
+                return Object.assign({}, item, {
+                    options: this.allSelectOptions["SYRZCLASS"]
+                })
+            }else if(item.attrField === 'ZRBM'){
+                return Object.assign({}, item, {
+                    options: this.allSelectOptions["ZRBMCLASS"]
+                })
+            }else if(item.attrField === 'ZRGCS'){
+                return Object.assign({}, item, {
+                    options: this.allSelectOptions["ZRGCSCLASS"]
+                })
+            }else if(item.attrField === 'TXLB'){
+                return Object.assign({}, item, {
+                    options: this.allSelectOptions["TXLBCLASS"]
+                })
+            }else {
+                return Object.assign({}, item, {
+                    options: this.allSelectOptions[item.selVal]
+                })
+            }
         } else {
           return item
         }

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -425,14 +425,14 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-                <custom-date-pick-with-text2
+                <custom-date-pick
                         :config="{
                 attrName: '发布日期',
                 attrField: 'issueTime'
               }"
                         v-model="sarStandardsInfoEO.issueTime"
                         :disabled="formdisableflag"
-                ></custom-date-pick-with-text2>
+                ></custom-date-pick>
                 <!--</el-form-item>-->
                 <el-form-item
                         prop="isRelateAccess"
@@ -475,12 +475,12 @@
                   ></custom-SVPPS>
                 </template>
                 <template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ'">
-                  <custom-date-pick-with-text
+                  <custom-date-pick
                     :key="field.attrField"
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
                     :disabled="formdisableflag"
-                  ></custom-date-pick-with-text>
+                  ></custom-date-pick>
                 </template>
                 <template v-else-if="field.attrType === 'DATE_PIC_OPTS'">
                   <custom-date-pick-group
@@ -501,6 +501,75 @@
                       :data-source="field.attrField === 'CBBH'"
                     ></custom-input-for-standards>
                   </template>
+                  <template v-else-if="field.attrField === 'CYCVPPSBM'">
+                    <el-form-item
+                            prop="CYCVPPSBM"
+                            label-width="150px"
+                            class="add-form-item"
+                    >
+                      <template slot="label">乘用车VPPS编码</template>
+                      <tree-select
+                              :disabled="false"
+                              width = "340"
+                              :data="busVppsOptions"
+                              :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
+                              :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
+                    </el-form-item>
+                  </template>
+                  <template v-else-if="field.attrField === 'KCCVPPSBM'">
+                    <el-form-item
+                            prop="KCCVPPSBM"
+                            label-width="150px"
+                            class="add-form-item"
+                    >
+                      <template slot="label">卡车VPPS编码</template>
+                      <tree-select
+                              :disabled="false"
+                              width = "340"
+                              :data="busVppsOptions"
+                              :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
+                              :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
+                    </el-form-item>
+                  </template>
+                  <template v-else-if="field.attrField === 'DYBXH'">
+                    <el-form-item
+                            prop="DYBXH"
+                            label-width="150px"
+                            class="add-form-item"
+                    >
+                      <template slot="label">模块结构单元变型号</template>
+                      <tree-select
+                              width = "340"
+                              :disabled="false"
+                              :data="modelOptions"
+                              :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+                              :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
+                    </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-input
+                              v-model="sarStandardsInfoEO.CYCVPPSCN" disabled
+                              clearable
+                      ></el-input>
+                    </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-input
+                              v-model="sarStandardsInfoEO.KCCVPPSCN" disabled
+                              clearable
+                      ></el-input>
+                    </el-form-item>
+                  </template>
+                  <template v-else-if="field.attrField === 'DYMC'">
+                    <el-form-item label="模块结构单元名称" label-width="150px" prop="DYMC" class="add-form-item">
+                      <el-input
+                              v-model="sarStandardsInfoEO.DYMC" disabled
+                              clearable
+                      ></el-input>
+                    </el-form-item>
+                  </template>
                   <template v-else>
                     <custom-input
                       :key="field.attrField"
@@ -544,39 +613,6 @@
                     :disabled="formdisableflag"
                   ></custom-textarea>
                 </template>
-                <template v-else-if="field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.selVal === 'ROLELIST'">
-                  <template v-if="field.attrField === 'XMPGJS'">
-                    <custom-role-tree
-                      :key="field.attrField"
-                      :config="field"
-                      v-model="sarStandardsInfoEO[field.attrField]"
-                      :disabled="formdisableflag"
-                      :data-model="sarStandardsInfoEO"
-                      :isRoleHierarchy="false"
-                      roleHierarchyName="VSE,FO,工程师"
-                    ></custom-role-tree>
-                  </template>
-                  <template v-else-if="field.attrField === 'ZRBM'">
-                    <custom-org
-                      :key="field.attrField"
-                      :config="field"
-                      :zNodes="orgData"
-                      v-model="sarStandardsInfoEO[field.attrField]"
-                      :disabled="formdisableflag"
-                      :data-model="sarStandardsInfoEO"
-                      @on-checked="onChecked"
-                    ></custom-org>
-                  </template>
-                  <template v-else>
-                    <custom-org
-                      :key="field.attrField"
-                      :config="field"
-                      :zNodes="orgData"
-                      v-model="sarStandardsInfoEO[field.attrField]"
-                      :disabled="formdisableflag"
-                      :data-model="sarStandardsInfoEO"></custom-org>
-                  </template>
-                </template>
                 <template v-else-if="field.attrType === 'SEL_OPTION'">
                   <custom-select
                     :key="field.attrField"
@@ -1067,8 +1103,22 @@ export default {
         children: 'children',
         label: 'menuName'
       },
+        nodeKeyCode: 'code',
+        nodeKeyModel: 'model',
       nodeKey: 'id',
-      defaultCheckedKeys: [],
+      defaultCheckedKeys1: [],
+      defaultCheckedKeys2: [],
+      defaultCheckedKeys3: [],
+      defaultCodeProps: {
+        children: 'children',
+        label: 'code'
+      },
+      defaultModelProps: {
+        children: 'children',
+        label: 'model'
+      },
+      busVppsOptions: [], // 车系体系架构
+      modelOptions: [], // 模块体系架构
       productModal: false, // 模态框是否打开
       modalType: '',
       productTitle: '', // 模态框标题
@@ -1341,7 +1391,22 @@ export default {
         sentScreenFileFeedback: '',
         approvalFileTime: '',
         approvalFileFeedback: '',
-        certPutTimeList: []
+        certPutTimeList: [],
+          CYCVPPSBM: '',
+          CYCVPPSCN: '',
+          KCCVPPSBM: '',
+          KCCVPPSCN: '',
+          DYBXH: '',
+          DYMC: '',
+          CYSD:'',
+          CLLX:'',
+          NYLX:'',
+          SYCPX:'',
+          SYRZ:'',
+          ZRBM:'',
+          ZRGCS:'',
+          WSSMR:'',
+          TXLB:'',
       }, // 标准新增过程中用到的对象
       currentFileList: '', // 当前操作的是哪个FormItem的上传
       isList: [
@@ -1648,11 +1713,46 @@ export default {
   watch: {
   },
   methods: {
+      popoverHideBusVs (checkedIds, checkedData) {
+          if(checkedData){
+              this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code
+              this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName
+              this.$forceUpdate()
+          }
+      },
+      popoverHideCarVs (checkedIds, checkedData) {
+          if(checkedData){
+              this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code
+              this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName
+              this.$forceUpdate()
+          }
+
+      },
+      popoverHideModel (checkedIds, checkedData) {
+          if(checkedData){
+              this.sarStandardsInfoEO.DYBXH = checkedData.model
+              this.sarStandardsInfoEO.DYMC = checkedData.name
+              this.$forceUpdate()
+          }
+      },
+      busVsFunc(){
+          this.$http.get('sarVppsTree/list', '', {
+              _this: this
+          }, res => {
+              this.busVppsOptions = res.data
+          })
+      },
+      modelFunc(){
+          this.$http.get('sarModelTree/list', '', {
+              _this: this
+          }, res => {
+              this.modelOptions = res.data
+          })
+      },
     popoverHide (checkedIds, checkedData) {
-      console.log(checkedIds);
+        if(checkedData){
-      console.log(checkedData);
+            this.sarStandardsInfoEO.standSystem = checkedData.id
-      this.sarStandardsInfoEO.standSystem = checkedData.id
+        }
-      console.log(this.sarStandardsInfoEO.standSystem);
     },
     closeModal () {
       this.productModal = false
@@ -1854,12 +1954,12 @@ export default {
       this.addOrUPdateFlag = 2
       this.modalshowtitle = '编辑海外标准'
       this.modalshowflag = true
-
       this.resolveFormFieldList(item.isRelateAccess)
       this.$nextTick(() => {
         Promise.all([this.queryDisplayLocation()]).then((values) => {
           const [displayLocation] = values
           const formFieldList = this.formFieldList
+            console.log(formFieldList)
           this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
           this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
           this.sarStandardsInfoEO.standSort = item.standSort
@@ -1885,6 +1985,15 @@ export default {
               if (value && field.attrType === 'DATE_PICKER') {
                 value = this.$moment(value).format('YYYY-MM-DD')
               }
+                if(field.attrField === 'CYCVPPSBM'){
+                    this.defaultCheckedKeys1 = [value]
+                }
+                if(field.attrField === 'KCCVPPSBM'){
+                    this.defaultCheckedKeys2 = [value]
+                }
+                if(field.attrField === 'DYBXH'){
+                    this.defaultCheckedKeys3 = [value]
+                }
               field['value'] = value
               // 追加用户名称和部门名称
               if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') {
@@ -2516,81 +2625,71 @@ export default {
       this.$message.success('保存成功')
     },
     // 保存或修改标准
-    saveOrUpdateStands () {
+      saveOrUpdateStands () {
-      this.$refs['sarStandardsInfoForm'].validate((valid) => {
+          this.isSubmit = true
-        if (valid) {
+          this.$refs['sarStandardsInfoForm'].validate((valid) => {
-          // 验证标准号是否唯一
+              if (valid) {
-          this.validateStandNumber(this.sarStandardsInfoEO).then((flag) => {
+                  // 验证标准号是否唯一
-            if (flag) {
+                  this.validateStandNumber(this.sarStandardsInfoEO).then((flag) => {
-              // 时间格式修改
+                      if (flag) {
-              let nowstandinfo = JSON.parse(JSON.stringify(this.sarStandardsInfoEO))
+                          // 时间格式修改
-              // if (nowstandinfo.issueTime != null && nowstandinfo.issueTime !== '') {
+                          let nowstandinfo = JSON.parse(JSON.stringify(this.sarStandardsInfoEO))
-              //   nowstandinfo.issueTime = this.$moment(this.sarStandardsInfoEO.issueTime).format('YYYY-MM-DD')
+                          if (nowstandinfo.putTime != null && nowstandinfo.putTime !== '') {
-              // }
+                              nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss')
-              if (nowstandinfo.putTime != null && nowstandinfo.putTime !== '') {
+                          }
-                nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss')
+                          // 代替标准号
+                          if (nowstandinfo.replaceStandNum != null) {
+                              nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/，/ig, ',')
+                          }
+                          if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') {
+                              nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '<br />')
+                              nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum === '' ? '' : nowstandinfo.replaceStandNum.replace(/\n/g, '<br />')
+                          }
+                          // 处理动态表单的时间和下拉框格式
+                          const formFieldList = this.formFieldList
+                          const sarStandAttrObj = {}
+                          formFieldList.forEach((item) => {
+                              const value = nowstandinfo[item.attrField]
+                              // 时间格式处理
+                              if (item.attrType === 'DATE_PICKER' && value) {
+                                  nowstandinfo[item.attrField] = this.$dateFormat(this.sarStandardsInfoEO[item.attrField], 'yyyy-MM-dd hh:mm:ss')
+                              }
+                              // 数组处理
+                              if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
+                                  if (value != null && (value instanceof Array)) {
+                                      nowstandinfo[item.attrField] = nowstandinfo[item.attrField].join(',')
+                                  }
+                              }
+                              sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
+                          })
+                          nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
+                          this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, {
+                              _this: this
+                          }, res => {
+                              this.isSubmit = false
+                              if (res.ok) {
+                                  this.getDomesticStandardTable(this.tableFlag)
+                                  this.resetForm()
+                                  if (this.addOrUPdateFlag === 1) {
+                                      sessionStorage.removeItem('STAND_INLAND')
+                                  }
+                              }
+                          }, e => {
+                              this.isSubmit = false
+                          })
+                      } else {
+                          this.isSubmit = false
+                      }
+                  }, e => {})
+              } else {
+                  this.isSubmit = false
+                  this.$message({
+                      message: '请检查表单是否填写正确',
+                      type: 'warning'
+                  })
               }
-              // 代替标准号
-              if (nowstandinfo.replaceStandNum != null) {
-                nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/，/ig, ',')
-              }
-              if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') {
-                nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '<br />')
-                nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum === '' ? '' : nowstandinfo.replaceStandNum.replace(/\n/g, '<br />')
-              }
-              // 处理动态表单的时间和下拉框格式
-              const formFieldList = this.formFieldList
-              const sarStandAttrObj = {}
-              formFieldList.forEach((item) => {
-                const value = nowstandinfo[item.attrField]
-                // 时间格式处理
-                if (item.attrType === 'DATE_PICKER' && value) {
-                  nowstandinfo[item.attrField] = this.$dateFormat(this.sarStandardsInfoEO[item.attrField], 'yyyy-MM-dd hh:mm:ss')
-                }
-                // 数组处理
-                if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
-                  if (value != null && (value instanceof Array)) {
-                    nowstandinfo[item.attrField] = nowstandinfo[item.attrField].join(',')
-                  }
-                }
-                sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
-              })
-              nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
-              // 判断三个实施日期不能全部未N/A和TBD
-              // if ((nowstandinfo.EOPSSRQ === 'N/A' || nowstandinfo.EOPSSRQ === 'TBD' || nowstandinfo.EOPSSRQ === '已实施') &&
-              //     (nowstandinfo.XCXSSRQ === 'N/A' || nowstandinfo.XCXSSRQ === 'TBD' || nowstandinfo.XCXSSRQ === '已实施') &&
-              //     (nowstandinfo.ZCCSSRQ === 'N/A' || nowstandinfo.ZCCSSRQ === 'TBD' || nowstandinfo.ZCCSSRQ === '已实施')) {
-              //   this.isSubmit = false
-              //   return this.$message.warning('实施日期必须有一项为日期格式')
-              // }
-              this.isSubmit = true
-              this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, {
-                _this: this
-              }, res => {
-                this.isSubmit = false
-                if (res.ok) {
-                  this.getDomesticStandardTable(this.tableFlag)
-                  this.resetForm()
-                  if (this.addOrUPdateFlag === 1) {
-                    sessionStorage.removeItem('FOREIGN_INLAND')
-                  }
-                }
-              }, e => {
-                this.isSubmit = false
-              })
-            } else {
-              this.isSubmit = false
-            }
-          }, e => {})
-        } else {
-          this.isSubmit = false
-          this.$message({
-            message: '请检查表单是否填写正确',
-            type: 'warning'
           })
-        }
+      },
-      })
-    },
     // 表格排序
     sortChange (sortObj) {
       if (sortObj.column.order !== 'normal') {
@@ -3488,28 +3587,70 @@ export default {
         })
       })
     },
-    resolveFormFieldList (isEdit) {
+      resolveFormFieldList (isEdit) {
-      const data = this.formFieldListData
+          const data = this.formFieldListData
-      this.formFieldList = data.map((item) => {
+          this.formFieldList = data.map((item) => {
-        if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
+              if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
-          return Object.assign({}, item, {
+                if(item.attrField === 'WSSMR'){
-            options: this.allSelectOptions[item.selVal]
+                  return Object.assign({}, item, {
+                    options: this.allSelectOptions["WSSMR"]
+                  })
+                }else if(item.attrField === 'QCDW'){
+                  return Object.assign({}, item, {
+                    options: this.allSelectOptions["QCDW"]
+                  })
+                }else if(item.attrField === 'CYSD'){
+                      return Object.assign({}, item, {
+                          options: this.allSelectOptions["WSCYSD"]
+                      })
+                }else if(item.attrField === 'CLLX'){
+                    return Object.assign({}, item, {
+                        options: this.allSelectOptions["ENERGYTYPES"]
+                    })
+                }else if(item.attrField === 'NYLX'){
+                    return Object.assign({}, item, {
+                        options: this.allSelectOptions["NYLXCLASS"]
+                    })
+                }else if(item.attrField === 'SYCPX'){
+                    return Object.assign({}, item, {
+                        options: this.allSelectOptions["SYCPXCLASS"]
+                    })
+                }else if(item.attrField === 'SYRZ'){
+                    return Object.assign({}, item, {
+                        options: this.allSelectOptions["SYRZCLASS"]
+                    })
+                }else if(item.attrField === 'ZRBM'){
+                    return Object.assign({}, item, {
+                        options: this.allSelectOptions["ZRBMCLASS"]
+                    })
+                }else if(item.attrField === 'ZRGCS'){
+                    return Object.assign({}, item, {
+                        options: this.allSelectOptions["ZRGCSCLASS"]
+                    })
+                }else if(item.attrField === 'TXLB'){
+                    return Object.assign({}, item, {
+                        options: this.allSelectOptions["TXLBCLASS"]
+                    })
+                }else {
+                    return Object.assign({}, item, {
+                        options: this.allSelectOptions[item.selVal]
+                    })
+                }
+              } else {
+                  return item
+              }
           })
-        } else {
+          // 处理时间格式的数据
-          return item
+          data.forEach(item => {
-        }
+              if (item.attrType === 'DATE_PICKER') {
-      })
+                  const date = this.sarStandardsInfoEO[item.attrField] ? new Date(this.sarStandardsInfoEO[item.attrField]) : ''
-      // 处理时间格式的数据
+                  this.$set(this.sarStandardsInfoEO, item.attrField, date)
-      data.forEach(item => {
+              } else {
-        if (item.attrType === 'DATE_PICKER') {
+                  this.$set(this.sarStandardsInfoEO, item.attrField, this.sarStandardsInfoEO[item.attrField] || '')
-          const date = this.sarStandardsInfoEO[item.attrField] ? new Date(this.sarStandardsInfoEO[item.attrField]) : ''
+              }
-          this.$set(this.sarStandardsInfoEO, item.attrField, date)
+          })
-        } else {
+          this.resolveFormFieldListRules(isEdit)
-          this.$set(this.sarStandardsInfoEO, item.attrField, this.sarStandardsInfoEO[item.attrField] || '')
+      },
-        }
-      })
-      this.resolveFormFieldListRules(isEdit)
-    },
     /**
      * 生成校验规则
      */
@@ -3812,6 +3953,8 @@ export default {
     // 加载动态表单数据
     this.getAddFormFieldList()
     this.getDept()
+    this.busVsFunc()
+    this.modelFunc()
   },
   destroyed () {
     this.allSelectOptions = {}

src/router/index.js

@@ -702,7 +702,7 @@ const routes = [
         meta: {
           requireAuth: false,
           // parentPath: '/standAutoSplit',
-          title: '标准分解单'
+          title: '拆分结果'
         }
       },
       // 标准编号申领

src/sysConfig/index.js

@@ -7,7 +7,7 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
-const devIp = '192.168.10.254'
+const devIp = '192.168.1.108'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'