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

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

@@ -104,7 +104,7 @@
           label-width="150px"
         >
           <input v-model="attributeEO.id" v-show="false">
-          <el-form-item label="所属模块" prop="sarType" class="add-form-item">
+          <el-form-item label="所属模块" class="add-form-item">
             <el-select
               v-model="attributeEO.sarType"
               placeholder="请选择"
@@ -118,13 +118,13 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="属性字段" prop="attrField" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
+          <el-form-item label="属性字段"  class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
             <el-input v-model.trim="attributeEO.attrField" :disabled="addOrEdit === 'edit'" placeholder="请输入属性字段" clearable/>
           </el-form-item>
-          <el-form-item label="属性名称" prop="attrName" class="add-form-item">
+          <el-form-item label="属性名称" class="add-form-item">
             <el-input v-model.trim="attributeEO.attrName" placeholder="请输入属性名称" clearable/>
           </el-form-item>
-          <el-form-item label="属性类型" prop="attrType" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
+          <el-form-item label="属性类型" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
             <el-select v-model="attributeEO.attrType" placeholder="请选择" :disabled="addOrEdit === 'edit'" filterable>
               <el-option
                 v-for="item in attrTypeOptions"
@@ -134,7 +134,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="选项值" prop="selVal" class="add-form-item" v-if="attributeEO.attrType === 'SEL_OPTION' || attributeEO.attrType === 'SEL_OPTS'">
+          <el-form-item label="选项值"  class="add-form-item" v-if="attributeEO.attrType === 'SEL_OPTION' || attributeEO.attrType === 'SEL_OPTS'">
             <el-select v-model="attributeEO.selVal" placeholder="请选择"  filterable>
               <el-option
                 v-for="item in relateDicIdOptions"
@@ -149,18 +149,18 @@
           <!--                  <Option v-for="opt in isMustOptions" :key="opt.value" :value="opt.value">{{ opt.label }}</Option>-->
           <!--                </Select>-->
           <!--              </el-form-item>-->
-          <el-form-item label="字段长度" prop="attrLen" class="add-form-item">
+          <el-form-item label="字段长度" class="add-form-item">
             <el-input v-model.number="attributeEO.attrLen" :disabled="addOrEdit === 'edit'" placeholder="只允许输入正整数" number  :maxlength="4"/>
           </el-form-item>
-          <el-form-item label="展示顺序" prop="orderNum" class="add-form-item">
+          <el-form-item label="展示顺序" class="add-form-item">
             <el-input v-model.number="attributeEO.orderNum" placeholder="只允许输入正整数" number  :maxlength="3"/>
           </el-form-item>
-          <el-form-item label="是否必填" prop="isMust" class="add-form-item">
+          <el-form-item label="是否必填"  class="add-form-item">
             <el-select v-model="attributeEO.isMust">
               <el-option v-for="opt in isMustOptions" :key="opt.value" :value="opt.value" :label="opt.label">{{ opt.label }}</el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="是否展示" prop="isShowImp" class="add-form-item">
+          <el-form-item label="是否展示" class="add-form-item">
             <el-select v-model="attributeEO.isShowImp">
               <el-option
                 v-for="opt in isMustOptions"
@@ -170,7 +170,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="展示区域" prop="showRegionId" class="add-form-item" v-if="attributeEO.isShowImp === '0'">
+          <el-form-item label="展示区域"  class="add-form-item" v-if="attributeEO.isShowImp === '0'">
             <el-select v-model="attributeEO.showRegionId">
               <el-option
                 v-for="opt in showRegionOptions"
@@ -261,7 +261,7 @@
         <el-form-item label="所属模块" prop="sarType" class="add-form-item">
           <el-select v-model="displayLocationDialogFormData.sarType" filterable>
             <el-option
-              v-for="item in sarTypeLocationOptions"
+              v-for="item in sarTypeOptions"
               :key="item.value"
               :label="item.label"
               :value="item.value"

src/pages/details/otherStandardDetails/index.vue

@@ -467,6 +467,7 @@
                 <el-date-picker
                     v-model="standItemSearch.XCXSSRQ"
                     type="date"
+                    value-format="yyyy-MM-dd"
                     placeholder="新车实施日期">
                 </el-date-picker>
               </div>
@@ -477,6 +478,7 @@
                 <el-date-picker
                     v-model="standItemSearch.ZCCSSRQ"
                     type="date"
+                    value-format="yyyy-MM-dd"
                     placeholder="在产车实施日期">
                 </el-date-picker>
               </div>
@@ -2396,6 +2398,9 @@ export default {
       this.standItemSearch.parts = ''
       this.standItemSearch.nameOrRequest = ''
       this.standItemSearch.fileType = ''
+      this.standItemSearch.itemsName=''
+      this.standItemSearch.ZCCSSRQ=''
+      this.standItemSearch.XCXSSRQ=''
       this.selectSarStandItems()
     },
     inputChange() {

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -97,7 +97,7 @@
                     <i class="iconfont">&#xe61e;</i>
                     <el-dropdown-menu slot="dropdown">
                       <el-dropdown-item :command="[scope.row, '属性']" v-btn-permission="''">属性</el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '编辑',  scope.$index]" v-if="splitStatus === '0'" v-btn-permission="''">编辑</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '编辑',  scope.$index]" v-if="splitStatus === '0' || splitStatus === '4'" v-btn-permission="''">编辑</el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '编辑',  scope.$index]" v-else :disabled="true" v-btn-permission="''">编辑</el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '复制']" v-btn-permission="''">复制</el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>

src/pages/localTool/standardWarning.vue

@@ -47,14 +47,14 @@
                         <div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standCode" label="编号" align="center">
+                    <el-table-column prop="standCode" label="标准编号" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
+                        <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="standName" label="标准名称" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>
@@ -112,14 +112,14 @@
                         <div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="standCode" label="编号" align="center">
+                    <el-table-column prop="standCode" label="标准编号" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
+                        <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="standName" label="标准名称" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>
@@ -170,12 +170,12 @@
                   >
                     <el-table-column prop="standCode" label="标准编号" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
+                        <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="standName" label="标准名称" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="itemsId" label="条款号" align="center">
@@ -236,12 +236,12 @@
                   >
                     <el-table-column prop="standCode" label="标准编号" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
+                        <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="standName" label="标准名称" align="center">
                       <template slot-scope="scope">
-                        <a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
+                        <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column prop="itemsId" label="条款号" align="center">
@@ -492,6 +492,17 @@ export default {
         }, e => {
       });
     },
+    //点击查看详情
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.standId,
+          pageType: item.standType + '_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
     //获取政策预警数据(type用于区别分页器切换)
     getPolicyDate() {
       this.loading[this.field] = true

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

@@ -82,7 +82,9 @@
         <template slot="title">拆分信息</template>
       </ProcessTitle>
       <div class="action-bar">
-                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
+        <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">
+          批量编辑
+        </el-button>
       </div>
       <el-table border
                 ref="selection"
@@ -114,7 +116,9 @@
           show-overflow-tooltip
           align="center">
           <template slot-scope="scope">
-                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+            <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">
+              查看条款内容
+            </el-button>
           </template>
         </el-table-column>
         <el-table-column
@@ -211,11 +215,13 @@
                       size="mini"
                       class="common-button-primary"
 
-                                                @click="sarStandCompareHisInfo">查询</el-button>
+                      @click="sarStandCompareHisInfo">查询
+                    </el-button>
                     <el-button
                       class="common-button-default"
                       size="mini"
-                                                @click="clearSearchStand">清空</el-button>
+                      @click="clearSearchStand">清空
+                    </el-button>
                   </el-formItem>
                 </el-form>
               </div>
@@ -238,18 +244,18 @@
                   label="标准号/政策号"
                   width="170"
                   align="center">
-<!--                                    <template slot-scope="scope">-->
+                  <!--                                    <template slot-scope="scope">-->
-<!--                                        <div @click="showUser(scope.row)" class="table-jump">{{ scope.row.showNumber }}</div>-->
+                  <!--                                        <div @click="showUser(scope.row)" class="table-jump">{{ scope.row.showNumber }}</div>-->
-<!--                                    </template>-->
+                  <!--                                    </template>-->
                 </el-table-column>
                 <el-table-column
                   prop="standName"
                   label="标准名称/政策名称"
                   show-overflow-tooltip
                   align="center">
-<!--                                    <template slot-scope="scope">-->
+                  <!--                                    <template slot-scope="scope">-->
-<!--                                        <span @click="showUser(scope.row)" class="table-jump">{{ scope.row.standName }}</span>-->
+                  <!--                                        <span @click="showUser(scope.row)" class="table-jump">{{ scope.row.standName }}</span>-->
-<!--                                    </template>-->
+                  <!--                                    </template>-->
                 </el-table-column>
                 <el-table-column
                   prop="fileTypeShow"
@@ -300,7 +306,10 @@
                   label="标准号"
                 >
                   <template slot-scope="scope">
-                                        <div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
+                    <div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{
+                        scope.row.standNumber
+                      }}-{{ scope.row.standYear }}
+                    </div>
                     <div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
                   </template>
                 </el-table-column>
@@ -321,7 +330,7 @@
                   width="150px"
                   label="新车型实施日期">
                   <template slot-scope="scope">
-                                        <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
+                    <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -329,7 +338,7 @@
                   width="150px"
                   label="在产车实施日期">
                   <template slot-scope="scope">
-                                        <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
+                    <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -357,7 +366,8 @@
       size="800px">
       <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
       <div slot="footer">
-                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭
+        </el-button>
       </div>
     </el-dialog>
     <Role-tree
@@ -372,11 +382,12 @@
 
 
 <script>
-    import ProcessHeader from '../../components/ProcessHeader'
+import ProcessHeader from '../../components/ProcessHeader'
-    import ProcessFooter from '../../components/ProcessFooter'
+import ProcessFooter from '../../components/ProcessFooter'
-    import ProcessTitle from '../../components/ProcessTitle'
+import ProcessTitle from '../../components/ProcessTitle'
-    import { saveTaskFirst } from 'api/process'
+import {saveTaskFirst} from 'api/process'
-    export default {
+
+export default {
   name: "bzjdStep1",
   data() {
     return {
@@ -409,10 +420,10 @@
       },
       formRules: {
         itemsNum: [
-                        { required: true, message: '请输入标准号/政策号', trigger: 'change' },
+          {required: true, message: '请输入标准号/政策号', trigger: 'change'},
         ],
         itemsName: [
-                        { required: true, message: '请输入标准名称/政策名称', trigger: 'change' },
+          {required: true, message: '请输入标准名称/政策名称', trigger: 'change'},
         ],
       },
       // 标准征求意见数据可库
@@ -425,7 +436,7 @@
       standCommonlySearch2: {
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
-                    userId : this.$store.getters.userInfo.userId,
+        userId: this.$store.getters.userInfo.userId,
         standType: 'INLAND'
       },
       spinShow: false,
@@ -444,10 +455,10 @@
       },
       roleFormRules: {
         zrUserId: [
-                        { required: true, message: '请选择责任部门对接人', trigger: 'change' },
+          {required: true, message: '请选择责任部门对接人', trigger: 'change'},
         ],
         deptUserId: [
-                        { required: true, message: '请选择标准法规部部长', trigger: 'change' },
+          {required: true, message: '请选择标准法规部部长', trigger: 'change'},
         ],
       },
       treeData: [],
@@ -463,6 +474,7 @@
       },
       roleRow: {},
       itemList: [],
+      itemListOld: [],
       zrType: '',
       zrIndex: '',
       zrIdList: []
@@ -474,14 +486,14 @@
     ProcessTitle
   },
   methods: {
-            itermsConditionsClose () {
+    itermsConditionsClose() {
       this.itermsConditionsFlag = false
     },
-            itermsConditionsOpen (row) {
+    itermsConditionsOpen(row) {
       this.itermsConditionsFlag = true
       this.itermsConditionsTitle = row
     },
-            showUser (row) {
+    showUser(row) {
       let routeUrl = this.$router.resolve({
         name: 'ItemSplitInfo',
         query: {
@@ -499,7 +511,7 @@
       //     }
       // })
     },
-            setMap(data){
+    setMap(data) {
       data.forEach(item => {
         this.$set(this.textStatusMap, item.value, item.label)
       })
@@ -519,7 +531,7 @@
     /** 标准征求意见库方法*
      * **********************************************/
     // 清空
-            clearSearchStand () {
+    clearSearchStand() {
       this.standCommonlySearch.page = 1
       this.standCommonlySearch.start = ''
       this.standCommonlySearch.end = ''
@@ -533,7 +545,7 @@
       this.sarStandCompareHis()
     },
     // 查询表格
-            sarStandCompareHis () {
+    sarStandCompareHis() {
       this.spinShow = true
       var form = this.standCommonlySearch
       this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage', form, {
@@ -545,7 +557,7 @@
       }, e => {
       })
     },
-            sarStandCompareHis2 () {
+    sarStandCompareHis2() {
       var form = this.standCommonlySearch2
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', form, {
         _this: this
@@ -569,22 +581,22 @@
       }, e => {
       })
     },
-            pageChange (page) {
+    pageChange(page) {
       this.standCommonlySearch.page = page
       this.sarStandCompareHis()
     },
     // 分页每页显示数改变后方法
-            pageSizeChange (pageSize) {
+    pageSizeChange(pageSize) {
       this.$store.getters.userInfo.configContent = pageSize
       this.standCommonlySearch.pageSize = pageSize
       this.sarStandCompareHis()
     },
-            pageChange2 (page) {
+    pageChange2(page) {
       this.standCommonlySearch2.page = page
       this.sarStandCompareHis2()
     },
     // 分页每页显示数改变后方法
-            pageSizeChange2 (pageSize) {
+    pageSizeChange2(pageSize) {
       this.$store.getters.userInfo.configContent = pageSize
       this.standCommonlySearch2.pageSize = pageSize
       this.sarStandCompareHis2()
@@ -597,7 +609,7 @@
         this.selectedList.push(data[i].id);
       }
     },
-            handleSelection2 (data) {
+    handleSelection2(data) {
       this.selectedList2 = [];
       for (let i = 0; i < data.length; i++) {
         this.selectedList2.push(data[i].id);
@@ -643,9 +655,15 @@
           if (res.ok) {
             res.data.list.forEach(item => {
               item.zrUserId = ''
-                                item.zrUserIdName= ''
+              item.zrUserIdName = ''
+            })
+
+            this.itemList = res.data.list.filter(item =>{
+              return item.workFlowShow === '1'
+            })
+            this.itemListOld = res.data.list.filter(item =>{
+              return item.workFlowShow === '0'
             })
-                            this.itemList = res.data.list
           }
           this.loading = false
         })
@@ -691,7 +709,7 @@
     },
     /*** **********************************************/
     /** 流程节点负责人的选择 *****************************/
-            saveUserInfo (data) {
+    saveUserInfo(data) {
       if (this.type === 0) {
         this.roleForm.deptUserId = data[0].id
         this.roleForm.deptUserIdName = data[0].name
@@ -699,8 +717,8 @@
         this.itemList[this.zrIndex].zrUserId = data[0].id
         this.itemList[this.zrIndex].zrUserIdName = data[0].name
       } else {
-                    this.itemList.forEach( item => {
+        this.itemList.forEach(item => {
-                        this.zrIdList.forEach( items => {
+          this.zrIdList.forEach(items => {
             if (item.id === items) {
               item.zrUserId = data[0].id
               item.zrUserIdName = data[0].name
@@ -710,7 +728,7 @@
       }
       this.modalshowflag = false
     },
-            choiceZRRS (row, type, index) {
+    choiceZRRS(row, type, index) {
       this.type = type
       if (type === 1) {
         this.drawerTitle = '选择责任人'
@@ -736,9 +754,9 @@
         this.modalshowflag = true
       }
     },
-            handleSelectionChange (val) {
+    handleSelectionChange(val) {
       this.zrIdList = []
-                val.forEach( item => {
+      val.forEach(item => {
         this.zrIdList.push(item.id)
       })
     },
@@ -790,6 +808,7 @@
                     json.commentText = this.commentText
                     json.standInData = this.sarType
                     json.itemList = this.itemList
+                    json.itemListOld = this.itemListOld
                     this.$http.post('lawss/activiti/completeTask', {
                       json: JSON.stringify(json),
                       taskId: res.data,
@@ -816,7 +835,7 @@
       })
     }
   },
-        mounted () {
+  mounted() {
     this.sarStandCompareHis()
     this.sarStandCompareHis2()
     this.tableHeight = $('.content').height() - 44
@@ -824,21 +843,24 @@
       this.tableHeight = $('.content').height() - 44
     }
   },
-    }
+}
 </script>
 
 <style lang="less" scoped>
-    @import '~@/assets/styles/style';
+@import '~@/assets/styles/style';
-    @import '~@/assets/styles/mixins';
+@import '~@/assets/styles/mixins';
-    .bzjdStep1 {
+
-        /deep/.el-drawer__container {
+.bzjdStep1 {
+  /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -846,6 +868,7 @@
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -853,12 +876,14 @@
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
@@ -866,38 +891,46 @@
     height: calc(~'100% - 107px');
     overflow: auto;
   }
+
   .standardForComments {
     height: 100%;
     background: #fff;
+
     .el-divider--horizontal {
       display: block;
       height: 1px;
       width: 100%;
       margin: 0;
     }
+
     flex-direction: column;
+
     .action-bar {
       margin-bottom: 5px;
       padding: 0;
     }
+
     .content {
       flex: auto;
       overflow: hidden;
       display: flex;
       flex-direction: column;
+
       .table-wrap {
         flex: auto;
         overflow: hidden;
         position: relative;
       }
     }
+
     & > .pagination {
       position: static;
-                /deep/.pagination-slot {
+
+      /deep/ .pagination-slot {
         padding: 0;
       }
     }
   }
-    }
+}
 </style>
 

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

@@ -328,11 +328,13 @@
             handleSave() {
               this.saveLoading = true;
               let _formData = new FormData();
+              let json  = this.form
+              json.data = this.data
               _formData.append("id", this.bpnId || "");
               _formData.append("prcType", "3");
               _formData.append("taskIds", this.taskIds);
               _formData.append("json", JSON.stringify({
-                form: this.json,
+                form: json,
                 commentText: this.commentText
               }));
               saveTaskForPub(_formData).then(res => {
@@ -400,7 +402,7 @@
                         this.form.endTime = data.endTime || data.form.endTime
                         this.form.cname = data.cname || data.form.cname
                         this.json = data
-                        this.data = data.info || data.data || []
+                        this.data = data.info || data.data || data.form.data|| []
                     }).catch(e => {
                     })
                 })

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

@@ -195,7 +195,7 @@
           sortable="custom"
           align="center">
           <template slot-scope="scope">
-                        <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -203,7 +203,7 @@
           label="完成时间"
           align="center">
           <template slot-scope="scope">
-                        <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -219,13 +219,14 @@
           label="状态"
           align="center">
           <template slot-scope="scope">
-                        <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+            <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
           </template>
         </el-table-column>
       </el-table>
     </div>
     <ProcessFooter
       show-submit
+      show-save
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
       @save="handleSave"
@@ -236,48 +237,48 @@
 </template>
 
 <script>
-    import ProcessHeader from '../../components/ProcessHeader'
+import ProcessHeader from "../../components/ProcessHeader";
-    import ProcessFooter from '../../components/ProcessFooter'
+import ProcessFooter from "../../components/ProcessFooter";
-    import ProcessTitle from '../../components/ProcessTitle'
+import ProcessTitle from "../../components/ProcessTitle";
-    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+import { inboundLiaisonDetail, processCreateStand, saveTaskForPub } from "api/process";
 
-    export default {
+export default {
   name: "bzzqyjStep5",
   data() {
     return {
       histortData: [],
       oldData: [],
       data: [],
-                commentText: '',
+      commentText: "",
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
       roleRow: {},
       nodeList: [],
-                type: '',
+      type: "",
       defaultProps: {
-                    children: 'children',
+        children: "children",
-                    label: 'name'
+        label: "name"
       },
       treeData: [], // 人员数据
       modalshowflag: false, // drawer开关
-                drawerTitle: '', //drawer标题
+      drawerTitle: "", //drawer标题
-                textarea: '', // 意见
+      textarea: "", // 意见
       ListModel: false, // 新增编辑抽屉开关
-                active: '1', // 默认显示
+      active: "1", // 默认显示
       isSubmit: false,
       saveLoading: false,
       form: {
-                    cid: '', // 编号
+        cid: "", // 编号
-                    endTime: '', // 结束日期
+        endTime: "", // 结束日期
-                    cname: '', // 名称
+        cname: "" // 名称
       },
       formRules: {
         responUserList: [
-                        { required: true, message: '请选择责任人', trigger: 'change' },
+          { required: true, message: "请选择责任人", trigger: "change" }
         ]
       },
       json: {}
-            }
+    };
   },
   components: {
     ProcessHeader,
@@ -285,63 +286,86 @@
     ProcessTitle
   },
   methods: {
-            getHistoryData () {
+    getHistoryData() {
-                this.$http.get('lawss/activiti/get_list_by_instance', {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
-                    prcNum: this.$route.query.prcNum,
+        prcNum: this.$route.query.prcNum
       }, {}, res => {
-                    this.histortData = res
+        this.histortData = res;
-                }, e => {})
+      }, e => {
+      });
     },
-            changeInput (index) {
+    changeInput(index) {
-                this.data[index].type = true
+      this.data[index].type = true;
     },
     handleTabs(name) {
-                this.active = name
+      this.active = name;
+    },
+    //保存事件
+    handleSave() {
+      this.saveLoading = true;
+      let _formData = new FormData();
+      let json = this.form;
+      json.data = this.data;
+      console.log(json);
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "3");
+      _formData.append("taskIds", this.taskIds);
+      _formData.append("json", JSON.stringify({
+        form: json,
+        commentText: this.commentText
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
     },
-            handleSave() {},
     handleSubmit() {
       if (this.data.length < 1) {
-                    this.$message.warning('请输入征求意见搞')
+        this.$message.warning("请输入征求意见搞");
       } else {
-                    var a = 0
+        var a = 0;
-                    var b = 0
+        var b = 0;
         // var c = 0
         for (let s1 = 0; s1 < this.data.length; s1++) {
           if (!this.data[s1].chapterNumber) {
-                            a++
+            a++;
           }
           if (!this.data[s1].chapterName) {
-                            b++
+            b++;
           }
           // if (!this.data[s1].commentText) {
           //     c++
           // }
         }
         if (a > 0) {
-                        this.$message.warning('请输入章节编号')
+          this.$message.warning("请输入章节编号");
         } else if (b > 0) {
-                        this.$message.warning('请输入章节名称')
+          this.$message.warning("请输入章节名称");
         }
           // else if (c > 0) {
           //     this.$message.warning('请输入意见内容')
         // }
         else {
-                        this.isSubmit = true
+          this.isSubmit = true;
-                        var json = this.json
+          var json = this.json;
-                        json.oldinfo = this.oldData
+          json.oldinfo = this.oldData;
-                        json.commentText = this.commentText
+          json.commentText = this.commentText;
-                        json.introduce = true
+          json.introduce = true;
-                        this.$http.post('lawss/activiti/completeTask', {
+          console.log(json);
+          this.$http.post("lawss/activiti/completeTask", {
             json: JSON.stringify(json),
             taskId: this.taskIds,
             userId: this.$store.getters.userInfo.userId
           }, {}, res => {
             if (res.success) {
-                                this.$message.success('提交成功')
+              this.$message.success("提交成功");
-                                this.$router.push('/processCenter')
+              this.$router.push("/processCenter");
             }
-                            this.isSubmit = false
+            this.isSubmit = false;
-                        })
+          });
         }
       }
     },
@@ -351,61 +375,87 @@
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-                        let data = JSON.parse(res.mesg)
+          let data = JSON.parse(res.mesg);
-                        this.form.cid = data.cid || data.form.cid
+          console.log(data);
-                        this.form.endTime = data.endTime || data.form.endTime
+          this.form.cid = data.cid || data.form.cid;
-                        this.form.cname = data.cname || data.form.cname
+          this.form.endTime = data.endTime || data.form.endTime;
-                        this.oldData = JSON.parse(JSON.stringify(data.summaryList))
+          this.form.cname = data.cname || data.form.cname;
-                        data.summaryList.forEach( item => {
+          if (data.summaryList === undefined && data.info === undefined) {
+            this.oldData = JSON.parse(JSON.stringify(data.form));
+            this.data = data.form.data;
+          }
+          if (data.summaryList.length !== 0) {
+            this.oldData = JSON.parse(JSON.stringify(data.summaryList));
+          }
+          if (data.info.length !== 0) {
+            this.oldData = JSON.parse(JSON.stringify(data.info));
+          }
+          data.summaryList.forEach(item => {
             if (item.state) {
             } else {
-                                item.state = '1'
+              item.state = "1";
+            }
+            item.type = false;
+          });
+          data.info.forEach(item => {
+            if (item.state) {
+            } else {
+              item.state = "1";
+            }
+            item.type = false;
+          });
+          this.json = data;
+          if (data.summaryList.length === 0) {
+            this.data = data.info;
+          } else {
+            this.data = data.summaryList;
           }
-                            item.type = false
-                        })
-                        this.json = data
-                        this.data = data.summaryList
           if (data.introduce) {
           } else {
-                            this.$http.get('slrs/sar-public-idea-all/getPublicIdea', {
+            this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {
               unique: data.uniques
             }, {}, res => {
               res.data.forEach(item => {
-                                    item.chapterNumber = item.partCode
+                item.chapterNumber = item.partCode;
-                                    item.responUserName= item.userName
+                item.responUserName = item.userName;
-                                    this.data.push(item)
+                this.data.push(item);
-                                })
+              });
-                            })
+            });
           }
         }).catch(e => {
-                    })
+        });
-                })
+      });
-            },
-        },
-        mounted () {
-            this.getHistoryData()
-            this.getData()
     }
+  },
+  mounted() {
+    this.getHistoryData();
+    this.getData();
   }
+};
 </script>
 
 <style lang="less" scoped>
-    @import '~@/assets/styles/style';
+@import '~@/assets/styles/style';
-    .bzdyStep5 {
+
-        /deep/.el-drawer__container {
+.bzdyStep5 {
+  /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
   .fileClass {
     cursor: pointer;
   }
-        .fileClass:hover{
+
+  .fileClass:hover {
     color: #0c91e5;
   }
+
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -413,6 +463,7 @@
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -420,18 +471,21 @@
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -439,6 +493,7 @@
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;
@@ -446,5 +501,5 @@
       }
     }
   }
-    }
+}
 </style>

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

@@ -59,11 +59,13 @@
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(data, '汇总单.xls')"
-                               size="mini">导出汇总单</el-button>
+                     size="mini">导出汇总单
+          </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(oldData, '征求意见搞.xls')"
-                               size="mini">导出征求意见搞</el-button>
+                     size="mini">导出征求意见搞
+          </el-button>
         </div>
         <el-table
           ref="multipleTable"
@@ -170,7 +172,7 @@
           sortable="custom"
           align="center">
           <template slot-scope="scope">
-                        <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -178,7 +180,7 @@
           label="完成时间"
           align="center">
           <template slot-scope="scope">
-                        <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -194,7 +196,7 @@
           label="状态"
           align="center">
           <template slot-scope="scope">
-                        <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+            <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -215,51 +217,51 @@
 </template>
 
 <script>
-    import ProcessHeader from '../../components/ProcessHeader'
+import ProcessHeader from "../../components/ProcessHeader";
-    import ProcessFooter from '../../components/ProcessFooter'
+import ProcessFooter from "../../components/ProcessFooter";
-    import ProcessTitle from '../../components/ProcessTitle'
+import ProcessTitle from "../../components/ProcessTitle";
-    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+import { inboundLiaisonDetail, processCreateStand } from "api/process";
 
-    export default {
+export default {
   name: "bzzqyjStep6",
   data() {
     return {
       histortData: [],
       oldData: [],
       data: [],
-                commentText: '',
+      commentText: "",
-                oldText : '',
+      oldText: "",
-                newText : '',
+      newText: "",
-                reason : '' ,
+      reason: "",
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
       roleRow: {},
       nodeList: [],
-                type: '',
+      type: "",
       defaultProps: {
-                    children: 'children',
+        children: "children",
-                    label: 'name'
+        label: "name"
       },
       treeData: [], // 人员数据
       modalshowflag: false, // drawer开关
-                drawerTitle: '', //drawer标题
+      drawerTitle: "", //drawer标题
-                textarea: '', // 意见
+      textarea: "", // 意见
       ListModel: false, // 新增编辑抽屉开关
-                active: '1', // 默认显示
+      active: "1", // 默认显示
       isSubmit: false,
       saveLoading: false,
       form: {
-                    cid: '', // 编号
+        cid: "", // 编号
-                    endTime: '', // 结束日期
+        endTime: "", // 结束日期
-                    cname: '', // 名称
+        cname: "" // 名称
       },
       formRules: {
         responUserList: [
-                        { required: true, message: '请选择责任人', trigger: 'change' },
+          { required: true, message: "请选择责任人", trigger: "change" }
         ]
       },
       json: {}
-            }
+    };
   },
   components: {
     ProcessHeader,
@@ -267,91 +269,94 @@
     ProcessTitle
   },
   methods: {
-            getHistoryData () {
+    getHistoryData() {
-                this.$http.get('lawss/activiti/get_list_by_instance', {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
-                    prcNum: this.$route.query.prcNum,
+        prcNum: this.$route.query.prcNum
       }, {}, res => {
-                    this.histortData = res
+        this.histortData = res;
-                }, e => {})
+      }, e => {
+      });
     },
-            stateText (row) {
+    stateText(row) {
-                if (row === '1') {
+      if (row === "1") {
-                    return '上报'
+        return "上报";
-                } else if (row === '2') {
+      } else if (row === "2") {
-                    return '处理后上报'
+        return "处理后上报";
       }
     },
-            upload (row, title) {
+    upload(row, title) {
       var params = {
         columnName: {
-                        chapterNumber : '章条编号',
+          chapterNumber: "章条编号",
-                        chapterName : '章节名称',
+          chapterName: "章节名称",
-                        commentText: '修改意见内容（包括理由或依据）',
+          commentText: "修改意见内容（包括理由或依据）",
-                        oldText : '修改前',
+          oldText: "修改前",
-                        newText : '修改后',
+          newText: "修改后",
-                        reason : '修改理由',
+          reason: "修改理由",
-                        department: '提出部门',
+          department: "提出部门",
-                        responUserName: '提出人',
+          responUserName: "提出人",
-                        stateText: '处理意见'
+          stateText: "处理意见"
         },
         dataList: []
-                }
+      };
-                params.dataList = JSON.parse(JSON.stringify(row))
+      params.dataList = JSON.parse(JSON.stringify(row));
       params.dataList.forEach(item => {
-                    if (item.state === '1') {
+        if (item.state === "1") {
-                        item.stateText = '上报'
+          item.stateText = "上报";
-                    } else if (item.state === '2') {
+        } else if (item.state === "2") {
-                        item.stateText = '处理后上报'
+          item.stateText = "处理后上报";
         } else {
-                        item.stateText = '不上报'
+          item.stateText = "不上报";
         }
-                })
+      });
-                this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
+      this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+      });
     },
     handleTabs(name) {
-                this.active = name
+      this.active = name;
+    },
+    handleSave() {
     },
-            handleSave() {},
     handleSubmit() {
       if (this.data.length < 1) {
-                    this.$message.warning('请输入征求意见搞')
+        this.$message.warning("请输入征求意见搞");
       } else {
-                    this.isSubmit = true
+        this.isSubmit = true;
-                    var json = this.json
+        var json = this.json;
-                    json.actionFlag = 0
+        json.actionFlag = 0;
-                    json.commentText = this.commentText
+        json.commentText = this.commentText;
-                    this.$http.post('lawss/activiti/completeTask', {
+        this.$http.post("lawss/activiti/completeTask", {
           json: JSON.stringify(json),
           taskId: this.taskIds,
           userId: this.$store.getters.userInfo.userId
         }, {}, res => {
           if (res.success) {
-                            this.$message.success('提交成功')
+            this.$message.success("提交成功");
-                            this.$router.push('/processCenter')
+            this.$router.push("/processCenter");
           }
-                        this.isSubmit = false
+          this.isSubmit = false;
-                    })
+        });
       }
     },
     handleSubmitNo() {
       if (this.commentText) {
-                    this.isSubmit = true
+        this.isSubmit = true;
-                    var json = this.json
+        var json = this.json;
-                    json.actionFlag = 1
+        json.actionFlag = 1;
-                    json.commentText = this.commentText
+        json.commentText = this.commentText;
-                    this.$http.post('lawss/activiti/completeTask', {
+        this.$http.post("lawss/activiti/completeTask", {
           json: JSON.stringify(json),
           taskIds: this.taskIds,
           userId: this.$store.getters.userInfo.userId
         }, {}, res => {
           if (res.success) {
-                            this.$message.success('驳回成功')
+            this.$message.success("驳回成功");
-                            this.$router.push('/processCenter')
+            this.$router.push("/processCenter");
           }
-                        this.isSubmit = false
+          this.isSubmit = false;
-                    })
+        });
       } else {
-                    this.$message.warning('请输入反馈意见')
+        this.$message.warning("请输入反馈意见");
       }
     },
     getData() {
@@ -360,48 +365,69 @@
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-                        let data = JSON.parse(res.mesg)
+          let data = JSON.parse(res.mesg);
-                        this.form.cid = data.cid
+          console.log(data);
-                        this.form.endTime = data.endTime
+          if (data.oldinfo === undefined) {
-                        this.form.cname = data.cname
+            this.form.cid = data.cid;
-                        var arr = []
+            this.form.endTime = data.endTime;
-                        data.summaryList.forEach( item => {
+            this.form.cname = data.cname;
-                            if (item.state != '3') {
+            var arr = [];
-                                arr.push(item)
+            data.summaryList.forEach(item => {
+              if (item.state != "3") {
+                arr.push(item);
+              }
+            });
+            this.json = data;
+            this.data = arr;
+            this.oldData = data.oldinfo;
+          } else {
+            this.form.cid = data.oldinfo.cid;
+            this.form.endTime = data.oldinfo.endTime;
+            this.form.cname = data.oldinfo.cname;
+            var arr = [];
+            data.oldinfo.data.forEach(item => {
+              if (item.state != "3") {
+                arr.push(item);
+              }
+            });
+            this.json = data;
+            this.data = arr;
+            this.oldData = data.oldinfo;
           }
-                        })
-                        this.json = data
-                        this.data = arr
-                        this.oldData = data.oldinfo
         }).catch(e => {
-                    })
+        });
-                })
+      });
-            },
-        },
-        mounted () {
-            this.getHistoryData()
-            this.getData()
     }
+  },
+  mounted() {
+    this.getHistoryData();
+    this.getData();
   }
+};
 </script>
 
 <style lang="less" scoped>
-    @import '~@/assets/styles/style';
+@import '~@/assets/styles/style';
-    .bzdyStep6 {
+
-        /deep/.el-drawer__container {
+.bzdyStep6 {
+  /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
   .fileClass {
     cursor: pointer;
   }
-        .fileClass:hover{
+
+  .fileClass:hover {
     color: #0c91e5;
   }
+
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -409,6 +435,7 @@
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -416,18 +443,21 @@
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -435,6 +465,7 @@
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;
@@ -442,5 +473,5 @@
       }
     }
   }
-    }
+}
 </style>

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

@@ -355,19 +355,34 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.cid = data.cid
+                      if (data.oldinfo === undefined) {
-                        this.form.endTime = data.endTime
+                        this.form.cid = data.cid;
-                        this.form.cname = data.cname
+                        this.form.endTime = data.endTime;
-                        var arr = []
+                        this.form.cname = data.cname;
-                        data.summaryList.forEach( item => {
+                        var arr = [];
-                            if (item.state != '3') {
+                        data.summaryList.forEach(item => {
-                                arr.push(item)
+                          if (item.state != "3") {
+                            arr.push(item);
+                          }
+                        });
+                        this.json = data;
+                        this.data = arr;
+                        this.oldData = data.oldinfo;
+                      } else {
+                        this.form.cid = data.oldinfo.cid;
+                        this.form.endTime = data.oldinfo.endTime;
+                        this.form.cname = data.oldinfo.cname;
+                        var arr = [];
+                        data.oldinfo.data.forEach(item => {
+                          if (item.state != "3") {
+                            arr.push(item);
+                          }
+                        });
+                        this.json = data;
+                        this.data = arr;
+                        this.oldData = data.oldinfo;
                       }
-                        })
-                        this.json = data
-                        this.data = arr
 
-                        this.oldData = data.oldinfo
                     }).catch(e => {
                     })
                 })

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

@@ -355,18 +355,33 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.cid = data.cid
+                      if (data.oldinfo === undefined) {
-                        this.form.endTime = data.endTime
+                        this.form.cid = data.cid;
-                        this.form.cname = data.cname
+                        this.form.endTime = data.endTime;
-                        var arr = []
+                        this.form.cname = data.cname;
-                        data.summaryList.forEach( item => {
+                        var arr = [];
-                            if (item.state != '3') {
+                        data.summaryList.forEach(item => {
-                                arr.push(item)
+                          if (item.state != "3") {
+                            arr.push(item);
+                          }
+                        });
+                        this.json = data;
+                        this.data = arr;
+                        this.oldData = data.oldinfo;
+                      } else {
+                        this.form.cid = data.oldinfo.cid;
+                        this.form.endTime = data.oldinfo.endTime;
+                        this.form.cname = data.oldinfo.cname;
+                        var arr = [];
+                        data.oldinfo.data.forEach(item => {
+                          if (item.state != "3") {
+                            arr.push(item);
+                          }
+                        });
+                        this.json = data;
+                        this.data = arr;
+                        this.oldData = data.oldinfo;
                       }
-                        })
-                        this.json = data
-                        this.data = arr
-                        this.oldData = data.oldinfo
                     }).catch(e => {
                     })
                 })

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

@@ -59,11 +59,13 @@
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(data, '汇总单.xls')"
-                               size="mini">导出汇总单</el-button>
+                     size="mini">导出汇总单
+          </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(oldData, '征求意见搞.xls')"
-                               size="mini">导出征求意见搞</el-button>
+                     size="mini">导出征求意见搞
+          </el-button>
         </div>
         <el-table
           ref="multipleTable"
@@ -170,7 +172,7 @@
           sortable="custom"
           align="center">
           <template slot-scope="scope">
-                        <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -178,7 +180,7 @@
           label="完成时间"
           align="center">
           <template slot-scope="scope">
-                        <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -194,7 +196,7 @@
           label="状态"
           align="center">
           <template slot-scope="scope">
-                        <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+            <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -215,48 +217,48 @@
 </template>
 
 <script>
-    import ProcessHeader from '../../components/ProcessHeader'
+import ProcessHeader from "../../components/ProcessHeader";
-    import ProcessFooter from '../../components/ProcessFooter'
+import ProcessFooter from "../../components/ProcessFooter";
-    import ProcessTitle from '../../components/ProcessTitle'
+import ProcessTitle from "../../components/ProcessTitle";
-    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+import { inboundLiaisonDetail, processCreateStand } from "api/process";
 
-    export default {
+export default {
   name: "bzzqyjStep9",
   data() {
     return {
       histortData: [],
       oldData: [],
       data: [],
-                commentText: '',
+      commentText: "",
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
       roleRow: {},
       nodeList: [],
-                type: '',
+      type: "",
       defaultProps: {
-                    children: 'children',
+        children: "children",
-                    label: 'name'
+        label: "name"
       },
       treeData: [], // 人员数据
       modalshowflag: false, // drawer开关
-                drawerTitle: '', //drawer标题
+      drawerTitle: "", //drawer标题
-                textarea: '', // 意见
+      textarea: "", // 意见
       ListModel: false, // 新增编辑抽屉开关
-                active: '1', // 默认显示
+      active: "1", // 默认显示
       isSubmit: false,
       saveLoading: false,
       form: {
-                    cid: '', // 编号
+        cid: "", // 编号
-                    endTime: '', // 结束日期
+        endTime: "", // 结束日期
-                    cname: '', // 名称
+        cname: "" // 名称
       },
       formRules: {
         responUserList: [
-                        { required: true, message: '请选择责任人', trigger: 'change' },
+          { required: true, message: "请选择责任人", trigger: "change" }
         ]
       },
       json: {}
-            }
+    };
   },
   components: {
     ProcessHeader,
@@ -264,88 +266,91 @@
     ProcessTitle
   },
   methods: {
-            getHistoryData () {
+    getHistoryData() {
-                this.$http.get('lawss/activiti/get_list_by_instance', {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
-                    prcNum: this.$route.query.prcNum,
+        prcNum: this.$route.query.prcNum
       }, {}, res => {
-                    this.histortData = res
+        this.histortData = res;
-                }, e => {})
+      }, e => {
+      });
     },
-            upload (row, title) {
+    upload(row, title) {
       var params = {
         columnName: {
-                        chapterNumber : '章条编号',
+          chapterNumber: "章条编号",
-                        chapterName : '章节名称',
+          chapterName: "章节名称",
-                        commentText: '修改意见内容（包括理由或依据）',
+          commentText: "修改意见内容（包括理由或依据）",
-                        department: '提出部门',
+          department: "提出部门",
-                        responUserName: '提出人',
+          responUserName: "提出人",
-                        stateText: '处理意见'
+          stateText: "处理意见"
         },
         dataList: []
-                }
+      };
-                params.dataList = JSON.parse(JSON.stringify(row))
+      params.dataList = JSON.parse(JSON.stringify(row));
       params.dataList.forEach(item => {
-                    if (item.state === '1') {
+        if (item.state === "1") {
-                        item.stateText = '上报'
+          item.stateText = "上报";
-                    } else if (item.state === '2') {
+        } else if (item.state === "2") {
-                        item.stateText = '处理后上报'
+          item.stateText = "处理后上报";
         } else {
-                        item.stateText = '不上报'
+          item.stateText = "不上报";
         }
-                })
+      });
-                this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
+      this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+      });
     },
-            stateText (row) {
+    stateText(row) {
-                if (row === '1') {
+      if (row === "1") {
-                    return '上报'
+        return "上报";
-                } else if (row === '2') {
+      } else if (row === "2") {
-                    return '处理后上报'
+        return "处理后上报";
       }
     },
     handleTabs(name) {
-                this.active = name
+      this.active = name;
+    },
+    handleSave() {
     },
-            handleSave() {},
     handleSubmit() {
       if (this.data.length < 1) {
-                    this.$message.warning('请输入征求意见搞')
+        this.$message.warning("请输入征求意见搞");
       } else {
-                    this.isSubmit = true
+        this.isSubmit = true;
-                    var json = this.json
+        var json = this.json;
-                    json.actionFlag = 0
+        json.actionFlag = 0;
-                    json.commentText = this.commentText
+        json.commentText = this.commentText;
-                    this.$http.post('lawss/activiti/completeTask', {
+        this.$http.post("lawss/activiti/completeTask", {
           json: JSON.stringify(json),
           taskId: this.taskIds,
           userId: this.$store.getters.userInfo.userId
         }, {}, res => {
           if (res.success) {
-                            this.$message.success('提交成功')
+            this.$message.success("提交成功");
-                            this.$router.push('/processCenter')
+            this.$router.push("/processCenter");
           }
-                        this.isSubmit = false
+          this.isSubmit = false;
-                    })
+        });
       }
     },
     handleSubmitNo() {
       if (this.commentText) {
-                    this.isSubmit = true
+        this.isSubmit = true;
-                    var json = this.json
+        var json = this.json;
-                    json.actionFlag = 1
+        json.actionFlag = 1;
-                    json.commentText = this.commentText
+        json.commentText = this.commentText;
-                    this.$http.post('lawss/activiti/completeTask', {
+        this.$http.post("lawss/activiti/completeTask", {
           json: JSON.stringify(json),
           taskIds: this.taskIds,
           userId: this.$store.getters.userInfo.userId
         }, {}, res => {
           if (res.success) {
-                            this.$message.success('驳回成功')
+            this.$message.success("驳回成功");
-                            this.$router.push('/processCenter')
+            this.$router.push("/processCenter");
           }
-                        this.isSubmit = false
+          this.isSubmit = false;
-                    })
+        });
       } else {
-                    this.$message.warning('请输入反馈意见')
+        this.$message.warning("请输入反馈意见");
       }
     },
     getData() {
@@ -354,48 +359,68 @@
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-                        let data = JSON.parse(res.mesg)
+          let data = JSON.parse(res.mesg);
-                        this.form.cid = data.cid
+          if (data.oldinfo === undefined) {
-                        this.form.endTime = data.endTime
+            this.form.cid = data.cid;
-                        this.form.cname = data.cname
+            this.form.endTime = data.endTime;
-                        var arr = []
+            this.form.cname = data.cname;
-                        data.summaryList.forEach( item => {
+            var arr = [];
-                            if (item.state != '3') {
+            data.summaryList.forEach(item => {
-                                arr.push(item)
+              if (item.state != "3") {
+                arr.push(item);
+              }
+            });
+            this.json = data;
+            this.data = arr;
+            this.oldData = data.oldinfo;
+          } else {
+            this.form.cid = data.oldinfo.cid;
+            this.form.endTime = data.oldinfo.endTime;
+            this.form.cname = data.oldinfo.cname;
+            var arr = [];
+            data.oldinfo.data.forEach(item => {
+              if (item.state != "3") {
+                arr.push(item);
+              }
+            });
+            this.json = data;
+            this.data = arr;
+            this.oldData = data.oldinfo;
           }
-                        })
-                        this.json = data
-                        this.data = arr
-                        this.oldData = data.oldinfo
         }).catch(e => {
-                    })
+        });
-                })
+      });
-            },
-        },
-        mounted () {
-            this.getHistoryData()
-            this.getData()
     }
+  },
+  mounted() {
+    this.getHistoryData();
+    this.getData();
   }
+};
 </script>
 
 <style lang="less" scoped>
-    @import '~@/assets/styles/style';
+@import '~@/assets/styles/style';
-    .bzdyStep9 {
+
-        /deep/.el-drawer__container {
+.bzdyStep9 {
+  /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
   .fileClass {
     cursor: pointer;
   }
-        .fileClass:hover{
+
+  .fileClass:hover {
     color: #0c91e5;
   }
+
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -403,6 +428,7 @@
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -410,18 +436,21 @@
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -429,6 +458,7 @@
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;
@@ -436,5 +466,5 @@
       }
     }
   }
-    }
+}
 </style>

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

@@ -42,6 +42,12 @@
         <process-title>
           <template slot="title">填写信息</template>
         </process-title>
+        <div class="tableTitle">
+          <div class="tableButton">
+            <el-button class="common-button-primary add-button" type="primary" size="mini" @click="batchEdit">批量编辑
+            </el-button>
+          </div>
+        </div>
         <el-table
           :data="dataList"
           style="width: 100%; border: 1px solid #cccccc"
@@ -237,6 +243,17 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
+<!--          以后全选可能用-->
+<!--          <el-table-column-->
+<!--              prop="productionCompletionTime"-->
+<!--              align="center"-->
+<!--              fixed="right"-->
+<!--              width="160"-->
+<!--              label="操作">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-button style="width: 98%" size="small" type="primary" @click="">{{ "批量编辑" }}</el-button>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
         </el-table>
       </div>
       <div>
@@ -331,6 +348,73 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <el-drawer
+        title="批量填写"
+        :visible.sync="modalshowflag"
+        :wrapperClosable="false"
+        size="800px">
+      <div class="demo-drawer-content">
+        <el-form :model="batchEditForm" class="label-input-form" ref="projectComplianceForm" label-width="150">
+          <el-divider><span><b>在研产品</b></span></el-divider>
+          <el-formItem label="合规原因" class="add-form-item" >
+            <el-input
+                v-model="batchEditForm.complianceReasons"
+                placeholder="请输入合规原因"
+            ></el-input>
+          </el-formItem>
+          <el-form-item label="不合规项目" class="add-form-item" >
+            <el-input
+                v-model="batchEditForm.noCompliance"
+                placeholder="请输入不合规项目"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="不合规应对措施" class="add-form-item" >
+            <el-input
+                v-model="batchEditForm.countermeasures"
+                placeholder="请输入不合规应对措施"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="完成时间" class="add-form-item" >
+            <el-date-picker
+                v-model="batchEditForm.completionTime"
+                type="date"
+                placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+          <br>
+          <el-divider><span><b>在产产品</b></span></el-divider>
+          <el-formItem label="合规原因" class="add-form-item" >
+            <el-input
+                v-model="batchEditForm.zcComplianceReasons"
+                placeholder="请输入合规原因"
+            ></el-input>
+          </el-formItem>
+          <el-form-item label="不合规项目" class="add-form-item" >
+            <el-input
+                v-model="batchEditForm.zcNoCompliance"
+                placeholder="请输入不合规项目"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="不合规应对措施" class="add-form-item" >
+            <el-input
+                v-model="batchEditForm.zcCountermeasures"
+                placeholder="请输入不合规应对措施"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="完成时间" class="add-form-item" >
+            <el-date-picker
+                v-model="batchEditForm.zcCompletionTime"
+                type="date"
+                placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveBatchEditForm">确定</el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消</el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -349,6 +433,27 @@ export default {
   },
   data() {
     return {
+      batchEditForm: {
+        // 在研产品
+        // 合规
+        complianceReasons :'',
+        // 不合规
+        noCompliance :'',
+        // 应对措施
+        countermeasures :'',
+        // 完成时间
+        completionTime :'',
+
+        // 在产产品
+        // 合规
+        zcComplianceReasons :'',
+        // 不合规
+        zcNoCompliance:'',
+        // 应对措施
+        zcCountermeasures:'',
+        // 完成时间
+        zcCompletionTime:''
+      },
       hasChildren: true,
       active: "1",
       loading: false,
@@ -398,6 +503,83 @@ export default {
     };
   },
   methods: {
+    //批量编辑确定按钮事件
+    saveBatchEditForm() {
+
+      // console.log(this.selectList)
+      for( let a = 0; a < this.dataList.length; a++) {
+        for ( let b = 0; b < this.selectList.length; b++) {
+          if (this.dataList[a].id === this.selectList[b]) {
+            //合规
+            this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons
+            //不合规
+            this.dataList[a].noCompliance = this.batchEditForm.noCompliance
+            //应对措施
+            this.dataList[a].countermeasures = this.batchEditForm.countermeasures
+            //完成时间
+            this.dataList[a].completionTime = this.batchEditForm.completionTime
+            //合规
+            this.dataList[a].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
+            //不合规
+            this.dataList[a].zcNoCompliance = this.batchEditForm.zcNoCompliance
+            //应对措施
+            this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures
+            //完成时间
+            this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime
+          }else {
+            for (let i=0;i<this.dataList[a].children.length;i++){
+              if (this.dataList[a].children[i].id === this.selectList[b]){
+                //合规
+                this.dataList[a].children[i].complianceReasons = this.batchEditForm.complianceReasons
+                //不合规
+                this.dataList[a].children[i].noCompliance = this.batchEditForm.noCompliance
+                //应对措施
+                this.dataList[a].children[i].countermeasures = this.batchEditForm.countermeasures
+                //完成时间
+                this.dataList[a].children[i].completionTime = this.batchEditForm.completionTime
+                //合规
+                this.dataList[a].children[i].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
+                //不合规
+                this.dataList[a].children[i].zcNoCompliance = this.batchEditForm.zcNoCompliance
+                //应对措施
+                this.dataList[a].children[i].zcCountermeasures = this.batchEditForm.zcCountermeasures
+                //完成时间
+                this.dataList[a].children[i].zcCompletionTime = this.batchEditForm.zcCompletionTime
+              }
+            }
+          }
+
+        }
+      }
+      this.modalshowflag = false
+    },
+    cancelBatchEditForm() {
+      this.modalshowflag = false
+    },
+    //批量编辑
+    batchEdit() {
+      if (this.selectList.length > 0) {
+        //合规
+        this.batchEditForm.complianceReasons = ''
+        //不合规
+        this.batchEditForm.noCompliance = ''
+        //应对措施
+        this.batchEditForm.countermeasures = ''
+        //完成时间
+        this.batchEditForm.completionTime = ''
+        //合规
+        this.batchEditForm.zcComplianceReasons = ''
+        //不合规
+        this.batchEditForm.zcNoCompliance = ''
+        //应对措施
+        this.batchEditForm.zcCountermeasures = ''
+        //完成时间
+        this.batchEditForm.zcCompletionTime = ''
+        this.modalshowflag = true
+      } else {
+        this.$message.warning('请选择要编辑的数据')
+      }
+    },
     // 点击查看
     handlePreview(item) {
       let routeUrl = this.$router.resolve({
@@ -525,7 +707,11 @@ export default {
     },
     //标准表格选择框改变
     selectStandChange(data) {
-      this.selectList = data;
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].id);
+      }
+
     },
     getTree() {
       this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
@@ -605,6 +791,25 @@ export default {
     height: calc(~'100% - 103px');
     overflow: auto;
 
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+
     .accessStandardsAndRegulations {
       height: 100%;
     }

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -1686,7 +1686,7 @@ export default {
       orgTableValName: '',
       twoOptions: [],
       threeOptions: [],
-      sarType: 'STAND',
+      sarType: 'INLAND_STAND',
       productModal: false, // 模态框是否打开
       modalType: '',
       productTitle: '', // 模态框标题

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -341,6 +341,20 @@
                     label="文本状态"
                     width="110"
             >
+
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '被代替' " style="color: #F56C6C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-else-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-else>
+                  {{scope.row.standStatusShow}}
+                </span>
+              </template>
+
+
           </el-table-column>
           <el-table-column label="操作" align="center" width="50" fixed="right">
             <template slot-scope="scope">
@@ -1237,6 +1251,7 @@ export default {
             children: 'children',
             label: 'menuName'
         },
+
         advancedSearch:[],
         nodeKey: 'id',
         nodeKeyCode: 'code',

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -4105,7 +4105,7 @@ export default {
     queryDisplayLocation () {
       return new Promise((resolve, reject) => {
         this.$http.get('lawssBase/utArea/getAreaList', {
-          sarType: 'INLAND_STAND'
+          sarType: 'FOREIGN_STAND'
         }, {
           _this: this
         }, res => {

src/pages/searchCenter/pages/advancedSearch.vue

@@ -976,8 +976,8 @@
                   :label="$t('m.putTime')"
                   width="130">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== ''">
+                    <div v-if="selectIndex === 'INLAND_STAND' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')">
-                      {{ $dateFormat(new Date(scope.row.SSRQ), "yyyy-MM-dd") }}
+                      {{ $dateFormat(new Date(selectIndex === 'INLAND_STAND' ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
                     </div>
                     <div v-else></div>
                   </template>
@@ -987,7 +987,8 @@
                   width="180"
                   :label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '文本状态')">
                   <template slot-scope="scope">
-                    <div>
+                      <div :style="selectIndex === 'BUSINESS_STAND' ? (scope.row.textStatusBussName === '参考' ? 'color: #E6A23C;' :
+                      (scope.row.textStatusBussName === '作废' || scope.row.textStatusBussName === '被代替' ? 'color: #F56C6C;' : '')) : ''">
                       {{ selectIndex === 'INLAND_STAND' ? scope.row.textStatusName : (selectIndex === 'INLAND_LAWS' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}
                     </div>
                   </template>
@@ -2492,6 +2493,14 @@ export default {
 @import '~@/assets/styles/mixins';
 @import '~@/assets/styles/style';
 
+/deep/ .yellowClass{
+    color: #E6A23C !important;
+}
+
+/deep/ .redClass{
+    color: #F56C6C !important;
+}
+
 #advancedSearch {
   background: #fff;
   @borderColor: #BFBFBF;

src/pages/searchCenter/pages/standardSearch.vue

@@ -109,6 +109,17 @@
                                                 <div v-else></div>
                                             </template>
                                         </el-table-column>
+                                        <el-table-column
+                                                align="center"
+                                                :label="$t('m.putTime')"
+                                                width="130">
+                                            <template slot-scope="scope">
+                                                <div v-if="selectIndex === 'stand' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')">
+                                                    {{ $dateFormat(new Date((selectIndex === 'stand') ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
+                                                </div>
+                                                <div v-else></div>
+                                            </template>
+                                        </el-table-column>
                                         <el-table-column
                                                 v-if="selectIndex !== 'msgdyinfo'"
                                                 align="center"
@@ -116,7 +127,9 @@
                                                 width="200">
                                             <template slot-scope="scope">
                                                 <span v-if="selectIndex === 'laws'">{{ getLawsState(scope.row.statecode) }}</span>
-                                                <div v-else>{{ selectIndex === 'stand' ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}</div>
+                                                <div v-else  :class="selectIndex === 'enterprise' ? (scope.row.textStatusBussName === '参考' ? 'yellowClass' :
+                                                (scope.row.textStatusBussName === '作废' || scope.row.textStatusBussName === '被代替' ? 'redClass' : '')) : ''">
+                                                {{ selectIndex === 'stand' ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}</div>
                                             </template>
                                         </el-table-column>
                                         <el-table-column
@@ -2530,6 +2543,13 @@
 <style lang="less" scoped>
     @import '~@/assets/styles/mixins';
     @import '~@/assets/styles/style';
+    /deep/ .yellowClass{
+        color: #E6A23C;
+    }
+
+    /deep/ .redClass{
+        color: #F56C6C;
+    }
     /deep/ p{
         display: inline;
     }

src/sysConfig/index.js

@@ -4,10 +4,10 @@
  * @date: 2018-09-04 17:47:46
  */
 // 服务器地址
-// const devIp = '192.168.1.159'
+const devIp = '10.96.10.171'
+const devInterfacePORT = '9999'
+// const devIp = '10.5.103.101'
 // const devInterfacePORT = '9999'
-const devIp = '62.234.136.153'
-const devInterfacePORT = '8038'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
 const simpleFilePath = 'att/attFile/upload'
@@ -31,7 +31,7 @@ const processPort = '17210'
  *****************************************************************/
 // 生产环境配置
 const prodIp = '62.234.136.153'
-const prodInterfacePORT = '8038'
+const prodInterfacePORT = '8033'
 
 
 // 判断环境