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

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

@@ -473,6 +473,8 @@ export default {
     handleSubmit() {
       this.isSubmit = true;
       this.listForm.commentText = this.commentText;
+      this.listForm.children = this.dataList[0].children
+      this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
@@ -567,14 +569,14 @@ export default {
       } else if (this.type === 2) {
         this.selectList.forEach(item => {
           this.dataList.map(items => {
-            if (item.id == items.id) {
+            if (item.id === items.id) {
               items.workPeople = "";
               items.workPeopleId = "";
               this.$message.warning('您只能针对条款进行分发')
             }
             if (items.children.length) {
               items.children.map(childrenItem => {
-                if (childrenItem.id == item.id) {
+                if (childrenItem.id === item.id) {
                   childrenItem.workPeople = data[0].name;
                   childrenItem.workPeopleId = data[0].id;
                 }

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -184,11 +184,16 @@
                 label="标准号"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear" class="table-jump"
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: red"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
-                <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                    scope.row.standNumber
+                  }}-{{ scope.row.standYear }}</a>
+                <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
+                  {{ scope.row.standSortShow }}
                   {{ scope.row.standNumber }}</a>
               </template>
             </el-table-column>
@@ -197,7 +202,8 @@
                 label="标准名称"
             >
               <template slot-scope="scope">
-                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: red">{{ scope.row.standName }}</a>
+                <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
             <el-table-column
@@ -206,7 +212,8 @@
                 width="110px"
                 label="发布日期">
               <template slot-scope="scope">
-                {{ formatIssueDate(scope.row.issueTime) }}
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -216,7 +223,8 @@
                 label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
 
               </template>
             </el-table-column>
@@ -227,7 +235,8 @@
                 width="150px"
                 label="新车型实施日期">
               <template slot-scope="scope">
-                <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -236,7 +245,8 @@
                 width="150px"
                 label="在产车实施日期">
               <template slot-scope="scope">
-                <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -250,7 +260,8 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="50" fixed="right">

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

@@ -297,7 +297,8 @@
           >
             <template slot-scope="scope">
 <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              <a v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -306,7 +307,8 @@
             label="中文名称"
           >
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -315,7 +317,8 @@
             label="英文名称"
           >
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              <a v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -325,7 +328,8 @@
             width="110"
           >
             <template slot-scope="scope">
-              {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
+              <span v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              <span v-else>{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -335,7 +339,8 @@
             width="110"
           >
             <template slot-scope="scope">
-              {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
+              <span v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+              <span v-else>{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -347,10 +352,7 @@
             >
 
               <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">
+                <span v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red">
                   {{scope.row.standStatusShow}}
                 </span>
                 <span v-else>