Merge branch 'develop' into 'test'

Develop

See merge request !106

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"

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/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;
     }