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

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -232,39 +232,39 @@
       @cancel="handleCancel"
     >
       <a-spin :spinning="confirmLoading">
-      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
-        <a-row :gutter="24">
+          <a-row :gutter="24">
-          <a-col :span="24">
+            <a-col :span="24">
-            <div class="box-title-text-index">
+              <div class="box-title-text-index">
-              <div class="title-text-index">
+                <div class="title-text-index">
-                <span class="Required">*</span>
+                  <span class="Required">*</span>
-                <span class="title-text-text"
+                  <span class="title-text-text"
-                      :title="$t('TaskCutOffTime')">{{ $t('TaskCutOffTime') }}</span>
+                        :title="$t('TaskCutOffTime')">{{ $t('TaskCutOffTime') }}</span>
+                </div>
+                <a-form-model-item v-if="this.timeName == '清单'" class="itemModel" prop="inventoryAffirmDueDate">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+$t('TaskCutOffTime')"
+                                 @change="dateChange({db_field_name:'inventoryAffirmDueDate'})"
+                                 format="YYYY-MM-DD"
+                                 :disabledDate="disabledDate"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.inventoryAffirmDueDate"
+                                 style="width: 100%"/>
+                </a-form-model-item>
+                <a-form-model-item v-else-if="this.timeName == '任务'" class="itemModel" prop="taskAffirmDueDate">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+$t('TaskCutOffTime')"
+                                 @change="dateChange({db_field_name:'taskAffirmDueDate'})"
+                                 format="YYYY-MM-DD"
+                                 :disabledDate="disabledDate"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.taskAffirmDueDate"
+                                 style="width: 100%"/>
+                </a-form-model-item>
               </div>
-              <a-form-model-item v-if="this.timeName == '清单'" class="itemModel" prop="inventoryAffirmDueDate">
+            </a-col>
-                <a-date-picker class="box-input"
+          </a-row>
-                               :placeholder="$t('PleaseSelect')+$t('TaskCutOffTime')"
+        </a-form-model>
-                               @change="dateChange({db_field_name:'inventoryAffirmDueDate'})"
-                               format="YYYY-MM-DD"
-                               :disabledDate="disabledDate"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.inventoryAffirmDueDate"
-                               style="width: 100%"/>
-              </a-form-model-item>
-              <a-form-model-item v-else-if="this.timeName == '任务'" class="itemModel" prop="taskAffirmDueDate">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+$t('TaskCutOffTime')"
-                               @change="dateChange({db_field_name:'taskAffirmDueDate'})"
-                               format="YYYY-MM-DD"
-                               :disabledDate="disabledDate"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="formInline.taskAffirmDueDate"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
-      </a-form-model>
       </a-spin>
     </a-modal>
     <a-modal
@@ -1220,10 +1220,10 @@
         this.getList()
       },
       searchReset() {
+        this.queryParam = {}
         this.$refs.globalAdvancedQueryRef.resetLine()
         this.$refs.globalAdvancedQueryRef.emitCallback()
-        this.queryParam = {}
+        // this.getList()
-        this.getList()
       },
       addModelList() {
         this.getList()
@@ -1258,8 +1258,8 @@
           roleCode: roleCode
         }
         this.loading = true
-        this.getRoleByUserId()
         getAction(this.url.list, query).then((res) => {
+          this.getRoleByUserId()
           if (res.success) {
             this.dataSource = res.result
             this.loading = false

jero-web/src/views/projectManagement/projectLibrary/index.vue

@@ -107,10 +107,10 @@
         <a-icon type="plus"/>
         {{$t('newlyAdded')}}
       </div>
-      <div @click="handleDel" class="operator-text" v-has="'projectLibraryBase:deleteBatch'">
+      <!--      <div @click="handleDel" class="operator-text" v-has="'projectLibraryBase:deleteBatch'">-->
-        <a-icon type="delete"/>
+      <!--        <a-icon type="delete"/>-->
-        {{$t('BatchDelete')}}
+      <!--        {{$t('BatchDelete')}}-->
-      </div>
+      <!--      </div>-->
     </div>
     <div>
       <a-table
@@ -129,7 +129,10 @@
         </span>
         <span slot="operation" slot-scope="text,record">
 <!--            <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>-->
-            <a class="text-operation" v-has="'projectLibraryBase:delete'" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
+            <a class="text-operation"
+               v-has="'projectLibraryBase:delete'"
+               v-if="record.createBy == userInfoQuery.username"
+               @click="deleteLib(record)">{{$t('deleteLib')}}</a>
           <!--          <a class="text-operation" @click="entryNameClick(record)">{{$t('see')}}</a>-->
         </span>
       </a-table>
@@ -153,6 +156,7 @@
   import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
   import addModel from '../components/addModel'
   import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'index',
@@ -240,13 +244,16 @@
             scopedSlots: { customRender: 'operation' }
           }
         ],
+        userInfoQuery: {},
         queryParam: {}
       }
     },
     mounted() {
       this.getList()
+      this.userInfoQuery = this.userInfo()
     },
     methods: {
+      ...mapGetters(['userInfo']),
       handleToggleSearch() {
         this.toggleSearchStatus = !this.toggleSearchStatus
       },

jero-web/src/views/projectManagement/projectStatusBoard/index.vue

@@ -71,11 +71,11 @@
               <div class="process-content-right-xian"></div>
               <div class="process-content-content" :style="val.left"
                    v-for="(val,indexOne) in item.data[0]" :key="indexOne">
+                <div class="process-content-right-top" :title="val.name">{{val.name}}</div>
                 <a-tooltip placement="topLeft">
                   <template slot="title">
                     <span>{{val.time.slice(0,11)}}</span>
                   </template>
-                  <div class="process-content-right-top">{{val.name}}</div>
                   <img v-if="val.status == 1" src="../../../assets/done.svg" class="process-content-left"
                        alt="">
                   <img v-else-if="val.status == 2" src="../../../assets/open.svg"
@@ -242,6 +242,7 @@
       this.handlingTime = moment(new Date()).format('YYYY-MM-DD')
     },
     methods: {
+
       getTimeline() {
         let query = {
           startTime: this.startTime,
@@ -506,7 +507,7 @@
   }
 
   .box-top-content-left {
-    width: 160px;
+    width: 140px;
     float: left;
     padding-top: 100px;
     margin-right: 20px;
@@ -515,8 +516,8 @@
   .box-top-content-left-text {
     color: #191E29;
     font-weight: bold;
-    font-size: 14px;
+    font-size: 12px;
-    height: 104px;
+    height: 84px;
     letter-spacing: 0px;
     text-align: left;
     text-overflow: ellipsis;
@@ -525,7 +526,7 @@
   }
 
   .box-top-content-right {
-    width: calc(100% - 180px);
+    width: calc(100% - 160px);
     float: left;
   }
 
@@ -544,7 +545,7 @@
     padding-left: 10px;
     color: #54565A;
     font-weight: bold;
-    font-size: 14px;
+    font-size: 13px;
     line-height: 36px;
     letter-spacing: 0px;
     text-align: center;
@@ -561,7 +562,7 @@
 
   .process-content {
     position: relative;
-    height: 104px;
+    height: 84px;
 
     .process-content-content {
       background: #fff;
@@ -582,15 +583,22 @@
       }
 
       .process-content-right-top {
-        font-size: 14px;
+        font-size: 12px;
         color: #040B29;
-        max-width: 155px;
+        width: 50px;
-        text-overflow: ellipsis;
-        white-space: nowrap;
         overflow: hidden;
         position: absolute;
-        top: -8px;
+        top: -14px;
         left: 50%;
+        line-height: 1.2;
+        display: -webkit-box;
+        text-overflow: ellipsis;
+        /*! autoprefixer: off */
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        /*! autoprefixer: on;*/
+        text-justify: inter-ideograph;
+        word-break: break-all;
         transform: translate(-50%, -50%);
       }