Merge branch 'dev_test' into 'dev_20230829_change'

Dev test

See merge request laws-foton-slrs/foton-laws-system-front!121

src/pages/phone/phoneHome.vue

@@ -206,6 +206,8 @@ export default {
     bottom: 10px;
     left: 50%;
     transform: translateX(-50%);
+    border: 2px solid red;
+    padding: 5px;
   }
 }
 </style>

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控</template>
+      <template slot="proName">
+        企标制修订计划管控
+        <span v-if="toggleType">{{ toggleType === '1' ? '-计划合并' : toggleType === '2' ? '-计划延期' : toggleType === '3' ? '-计划取消' : toggleType === '4' ? '-计划更名' : '-计划立项' }}</span>
+      </template>
       <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控</template>
+      <template slot="proName">
+        企标制修订计划管控
+        <span>{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</span>>
+      </template>
       <template slot="proNode">批准</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -321,6 +324,7 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <loading :loading="isLoading">加载中...</loading>
   </div>
 </template>
 
@@ -357,6 +361,7 @@ export default {
       detailData: [],
       standSortOptions: [],
       cbcdOptions: [],
+      isLoading: false,
     }
   },
   mounted() {
@@ -412,6 +417,7 @@ export default {
       })
     },
     getData() {
+      this.isLoading = true
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.$route.query.taskIds,
@@ -422,6 +428,7 @@ export default {
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
+          this.isLoading = false
         })
       })
     },
@@ -434,6 +441,7 @@ export default {
         this.qbfsForm = JSON.parse(JSON.stringify(item))
         this.type = item.type
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
+        this.isLoading = false
       })
     },
     assemble(ids,names){

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

@@ -1,7 +1,7 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控</template>
+      <template slot="proName">企标制修订计划管控{{ toggleType === '1' ? '-计划合并' : toggleType === '2' ? '-计划延期' : toggleType === '3' ? '-计划取消' : toggleType === '4' ? '-计划更名' : '-计划立项' }}</template>
       <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -1,7 +1,10 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控</template>
+      <template slot="proName">
+        企标制修订计划管控
+        <span v-if="type">{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</span>
+      </template>
       <template slot="proNode">审核</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -343,6 +346,7 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <loading :loading="isLoading">加载中...</loading>
   </div>
 </template>
 
@@ -379,7 +383,7 @@ export default {
       drawerTitle: '',
       detailData: [],
       cbcdOptions: [],
-
+      isLoading: false,
     }
   },
   mounted() {
@@ -435,6 +439,7 @@ export default {
       })
     },
     getData() {
+      this.isLoading = true
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.$route.query.taskIds,
@@ -445,6 +450,7 @@ export default {
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
+          this.isLoading = false
         })
       })
     },
@@ -458,6 +464,7 @@ export default {
         console.log(item.area.join(','));
         this.type = item.type
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
+        this.isLoading = false
       })
     },
     assemble(ids,names){

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

@@ -1,7 +1,10 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控</template>
+      <template slot="proName">
+        企标制修订计划管控
+        <span v-if="type">{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</span>
+      </template>
       <template slot="proNode">会签</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -339,6 +342,7 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <loading :loading="isLoading">加载中...</loading>
   </div>
 </template>
 
@@ -375,6 +379,7 @@ export default {
       detailData: [],
       standSortOptions: [],
       cbcdOptions: [],
+      isLoading: false,
     }
   },
   mounted() {
@@ -430,6 +435,7 @@ export default {
       })
     },
     getData() {
+      this.isLoading = true
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.$route.query.taskIds,
@@ -440,6 +446,7 @@ export default {
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
+          this.isLoading = false
         })
       })
     },
@@ -452,6 +459,7 @@ export default {
         this.qbfsForm = JSON.parse(JSON.stringify(item))
         this.type = item.type
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
+        this.isLoading = false
       })
     },
     assemble(ids,names){

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

@@ -1,7 +1,10 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控</template>
+      <template slot="proName">
+        企标制修订计划管控
+        <span v-if="type">{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</span>
+      </template>
       <template slot="proNode">审定</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -341,6 +344,7 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <loading :loading="isLoading">加载中...</loading>
   </div>
 </template>
 
@@ -377,6 +381,7 @@ export default {
       detailData: [],
       standSortOptions: [],
       cbcdOptions: [],
+      isLoading: false,
     }
   },
   mounted() {
@@ -432,6 +437,7 @@ export default {
       })
     },
     getData() {
+      this.isLoading = true
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.$route.query.taskIds,
@@ -442,6 +448,7 @@ export default {
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
+          this.isLoading = false
         })
       })
     },
@@ -454,6 +461,7 @@ export default {
         this.qbfsForm = JSON.parse(JSON.stringify(item))
         this.type = item.type
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
+        this.isLoading = false
       })
     },
     assemble(ids,names){

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

@@ -1,7 +1,10 @@
 <template>
   <div class="qbzxd-jhgk">
     <ProcessHeader toggle>
-      <template slot="proName">企标制修订计划管控</template>
+      <template slot="proName">
+        企标制修订计划管控
+        <span v-if="type">{{ type === '1' ? '-计划合并' : type === '2' ? '-计划延期' : type === '3' ? '-计划取消' : type === '4' ? '-计划更名' : '-计划立项' }}</span>
+      </template>
       <template slot="proNode">批准</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -341,6 +344,7 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <loading :loading="isLoading">加载中...</loading>
   </div>
 </template>
 
@@ -377,6 +381,7 @@ export default {
       detailData: [],
       standSortOptions: [],
       cbcdOptions: [],
+      isLoading: false,
     }
   },
   mounted() {
@@ -432,6 +437,7 @@ export default {
       })
     },
     getData() {
+      this.isLoading = true
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.$route.query.taskIds,
@@ -442,6 +448,7 @@ export default {
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
+          this.isLoading = false
         })
       })
     },
@@ -454,6 +461,7 @@ export default {
         this.qbfsForm = JSON.parse(JSON.stringify(item))
         this.type = item.type
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
+        this.isLoading = false
       })
     },
     assemble(ids,names){

src/pages/searchCenter/pages/standardSearch.vue

@@ -59,7 +59,7 @@
                                     <ul :class="[key, {'is-close': condition.isClose}]">
                                         <li v-for="(conditionOpt, optIndex) in optionsFun(condition.options)" :key="optIndex + condition.title">
                                           <span :class="{ 'selected': searchCondition[key].indexOf(conditionOpt.value) !== -1 }" @click="optChecked(key, conditionOpt.value)">{{ conditionOpt.label }}
-                                            <span v-if="conditionOpt.number !== null && conditionOpt.number !== undefined && selectIndex !== 'All'">(<font style="color: red">{{ conditionOpt.number}}</font>)</span>
+<!--                                            <span v-if="conditionOpt.number !== null && conditionOpt.number !== undefined && selectIndex !== 'All'">(<font style="color: red">{{ conditionOpt.number}}</font>)</span>-->
                                           </span>
                                         </li>
                                     </ul>
@@ -89,13 +89,13 @@
                                         <!--                  <el-button type="primary" size="small" @click="exportSearchResult" class="common-button-default export-button"-->
                                         <!--                             round><i class="iconfont">&#xe6e9;</i>导出</el-button>-->
                                     </div>
-                                  <div class="operate-area" style="padding: 0 10px 10px 10px">
+<!--                                  <div class="operate-area" style="padding: 0 10px 10px 10px">-->
-                                    <el-button
+<!--                                    <el-button-->
-                                        size="mini"
+<!--                                        size="mini"-->
-                                        type="primary"
+<!--                                        type="primary"-->
-                                        @click="openStandSystemModel">选择标准体系
+<!--                                        @click="openStandSystemModel">选择标准体系-->
-                                    </el-button>
+<!--                                    </el-button>-->
-                                  </div>
+<!--                                  </div>-->
                                     <el-table
                                             ref="selection"
                                             :data="resultData"
@@ -130,8 +130,9 @@
                                                 align="center"
                                                 :label="(selectIndex === 'stand'||'bussstand') && selectIndex !== 'laws'  ? $t('m.standName') : (selectIndex === 'laws' ? '中文名称' : $t('m.enterpriseStandardName'))">
                                             <template slot-scope="scope">
-                                                <a class="jumpColor" style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ selectIndex === 'laws' ? scope.row.lawsName : scope.row.nameshow }}</a>
+                                              <!--<a class="jumpColor" style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ selectIndex === 'laws' ? scope.row.lawsName : scope.row.nameshow }}</a>-->
-                                            </template>
+                                              <a v-if="selectIndex === 'laws'" class="jumpColor" style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{scope.row.lawsName }}</a>
+                                              <a v-else class="jumpColor" style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ scope.row.standName || scope.row.stand_name || scope.row.nameshow || scope.row.standEnName || scope.row.stand_en_name }}</a></template>
                                         </el-table-column>
                                       <el-table-column
                                           min-width="12%"