Parcourir la source

针对雷电的项目编号改成项目令号

Lijy il y a 9 mois
Parent
commit
4d29f5d054

+ 16 - 16
fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -228,7 +228,7 @@
         <div class="staff" ref="tabless" :style="'width:'+(windowWidth - 430)+'px'">
             <!--项目报表 -->
             <el-table v-if="ins == 0" key="0" border :data="list0" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
-                <el-table-column  prop="projectCode" :label="$t('Itemno')"  width="120"></el-table-column>
+                <el-table-column  prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : user.companyId == '7030' ? '项目令号' : $t('Itemno')"  width="120"></el-table-column>
                 <el-table-column  prop="projectName" :label="$t('headerTop.projectName')" width="200">
                   <template slot-scope="scope" >
                     {{scope.row.projectName}}
@@ -283,7 +283,7 @@
 
             <!-- 项目任务报表 -->
             <el-table v-if="ins == 1" key="1" border :data="list1" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;" :span-method="objectSpanMethod">
-                <el-table-column  prop="project_code" :label="$t('Itemno')"  width="120"></el-table-column>
+                <el-table-column  prop="project_code" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')"  width="120"></el-table-column>
                 <el-table-column  prop="project_name" :label="$t('headerTop.projectName')" width="200">
                   <template slot-scope="scope" >
                     <!-- {{scope.row.project_name}} -->
@@ -360,7 +360,7 @@
 
             <!--项目成本报表 -->
             <el-table v-if="ins == 2"  key="2" border :data="list2" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
-                <el-table-column  prop="projectCode" :label="$t('Itemno')"  width="120"></el-table-column>
+                <el-table-column  prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')"  width="120"></el-table-column>
                 <el-table-column  prop="projectName" :label="$t('headerTop.projectName')" >
                   <template slot-scope="scope" >
                     {{scope.row.projectName}}
@@ -407,7 +407,7 @@
 
             <!--项目收支平衡表 -->
             <el-table v-if="ins == 3"  key="3" border :data="list3" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
-                <el-table-column prop="projectCode" :label="$t('Itemno')"  width="120"></el-table-column>
+                <el-table-column prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')"  width="120"></el-table-column>
                 <el-table-column prop="projectName" :label="$t('headerTop.projectName')" >
                   <template slot-scope="scope" >
                     {{scope.row.projectName}}
@@ -518,7 +518,7 @@
             <el-table v-if="ins == 5" border :data="list5" key="5"
             highlight-current-row v-loading="listLoading" :height="tableHeight" 
              style="width: 100%;" ref="table">
-                <el-table-column prop="projectCode" :label="$t('Itemno')"  width="120" fixed ></el-table-column>
+                <el-table-column prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')"  width="120" fixed ></el-table-column>
                 <el-table-column prop="projectName" :label="$t('headerTop.projectName')" width="240" fixed  >
                   <template slot-scope="scope" >
                     {{scope.row.projectName}}
@@ -551,7 +551,7 @@
             highlight-current-row v-loading="listLoading" :height="tableHeight" 
              style="width: 66%;float:right;" ref="grouptable">
                 <el-table-column :label="$t('statisticsbyproject')" header-align="center">
-                  <el-table-column prop="projectCode" :label="$t('Itemno')" min-width="75"></el-table-column>
+                  <el-table-column prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" min-width="75"></el-table-column>
                   <el-table-column prop="projectName" :label="$t('headerTop.projectName')" min-width="125"></el-table-column>
                   <el-table-column prop="groupName" :label="$t('groupname')" min-width="100"></el-table-column>
                   <el-table-column prop="workingTime" :label="$t('time.workingHours')+ '(h)'" min-width="50" align="right" header-align="center">
@@ -575,7 +575,7 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column prop="projectCode" :label="$t('Itemno')" width="220"></el-table-column>
+                <el-table-column prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" width="220"></el-table-column>
                 <el-table-column prop="projectName" :label="$t('headerTop.projectName')" width="220"></el-table-column>
                 <el-table-column prop="degreeName" :label="user.timeType.customDegreeName" width="180" v-if="user.timeType.customDegreeActive == 1"></el-table-column>
                 <el-table-column prop="username" :label="$t('lable.name')" width="120">
@@ -693,7 +693,7 @@
             <!-- 工时成本预警表 -->
             <el-table v-if="ins == 7" key="7" border :data="baseCostList" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
             <!-- 当前总预算,已发生工时成本,xxx成本预算,xxx已发生成本,xxx已发生占比, yyy成本预算,yyy已发生成本,yyy已发生占比。 -->
-                <el-table-column  prop="projectCode" :label="$t('Itemno')"  width="120" fixed></el-table-column>
+                <el-table-column  prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')"  width="120" fixed></el-table-column>
                 <el-table-column  prop="projectName" :label="$t('headerTop.projectName')" min-width="200" fixed></el-table-column>
                 <el-table-column prop="baseCurcost" :label="$t('currenttotalbudget')" width="150" align="right">
                   <template slot-scope="scope">
@@ -855,7 +855,7 @@
 
             <!-- 项目成本基线表 -->
             <el-table v-if="ins == 13" key="13" border :data="outputValueList" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
-                <el-table-column prop="projectCode" :label="$t('Itemno')" min-width="150"></el-table-column>
+                <el-table-column prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" min-width="150"></el-table-column>
                 <el-table-column prop="projectName" :label="$t('headerTop.projectName')" min-width="250"></el-table-column>
                 <el-table-column v-for="item in outputValueTitle" :key="item" :label="item" min-width="150" align="right">
                   <template slot-scope="scope">
@@ -952,7 +952,7 @@
 
             <!-- 项目各分组与阶段工时表 -->
             <el-table v-if="ins == 16"  key="16" border :data="groupingItemsArr" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
-                <el-table-column align="center" prop="projectCode" :label="$t('Itemno')" min-width="150"></el-table-column>
+                <el-table-column align="center" prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" min-width="150"></el-table-column>
                 <el-table-column align="center" prop="projectName" :label="$t('headerTop.projectName')" min-width="150"></el-table-column>
                 <el-table-column align="center" prop="groupName" :label="$t('other.taskGroup')" min-width="150"></el-table-column>
                 <el-table-column align="center" prop="workingTime" :label="$t('fen-zu-he-ji-gong-shi')" min-width="150"></el-table-column>
@@ -977,7 +977,7 @@
 
             <!-- 任务重启表 -->
             <el-table v-if="ins == 18"  key="18" border :data="taskRestartArr" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
-                <el-table-column align="center" prop="projectCode" :label="$t('Itemno')" min-width="150"></el-table-column>
+                <el-table-column align="center" prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" min-width="150"></el-table-column>
                 <el-table-column align="center" prop="projectName" :label="$t('headerTop.projectName')" min-width="150"></el-table-column>
                 <el-table-column align="center" prop="taskName" :label="$t('nameofthetask')" min-width="150"></el-table-column>
                 <el-table-column align="center" prop="restartReason" :label="$t('zhongQiYuanYin')" min-width="150"></el-table-column>
@@ -1000,7 +1000,7 @@
             <!-- FTE报表 -->
             <el-table v-if="ins == 19"  key="19" border :data="fTEDataList" highlight-current-row v-loading="listLoading" :height="+tableHeight - 1" style="width: 100%;" @sort-change="tableSort">
                 <el-table-column align="center" prop="area" :label="customName" min-width="150"></el-table-column>
-                <el-table-column align="center" prop="projectCode" :label="$t('Itemno')" min-width="150"></el-table-column>
+                <el-table-column align="center" prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" min-width="150"></el-table-column>
                 <el-table-column align="center" prop="projectName" :label="$t('headerTop.projectName')" min-width="250"></el-table-column>
                 <el-table-column align="center" prop="userName" :label="$t('renMing')" min-width="150" sortable="custom">
                   <template slot-scope="scope">
@@ -1167,7 +1167,7 @@
                 </template>
               </el-table-column>
               <el-table-column align="center" prop="projectName" :label="$t('headerTop.projectName')"></el-table-column>
-              <el-table-column align="center" prop="projectCode" :label="$t('Itemno')"></el-table-column>
+              <el-table-column align="center" prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')"></el-table-column>
               <el-table-column align="center" prop="residueTime" :label="$t('shengYuGongShiH')" width="150"></el-table-column>
             </el-table>
             <div class="packetConsumption" v-if="ins == 24" :style="`height:${tabPosition == 0 ? tableHeight : tableHeight + 50}px`" v-loading="listLoading">
@@ -1284,7 +1284,7 @@
             <el-table  v-if="ins == 25" :key="25" border :data="isbeCustomReport.consumptionScheduleTwo" highlight-current-row v-loading="listLoading" :height="(+tableHeight) - 1" style="width: 100%;" >
               <el-table-column align="center" prop="projectName" :label="$t('headerTop.projectName')" min-width="220"></el-table-column>
               <el-table-column align="center" prop="categoryName" :label="$t('projectclassification')" min-width="150"></el-table-column>
-              <el-table-column align="center" prop="projectCode" :label="$t('Itemno')" min-width="150"></el-table-column>
+              <el-table-column align="center" prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" min-width="150"></el-table-column>
               <el-table-column align="center" prop="planStartDate" :label="$t('starttimes')" min-width="150"></el-table-column>
               <el-table-column align="center" prop="planEndDate" :label="$t('deadline')" min-width="150"></el-table-column>
               <el-table-column align="center" prop="planHour" :label="$t('fenPeiGongShiH')" width="100"></el-table-column>
@@ -1354,7 +1354,7 @@
                 </template>
               </el-table-column>
               <el-table-column align="center" prop="projectName" :label="$t('headerTop.projectName')" min-width="150"></el-table-column>
-              <el-table-column align="center" prop="projectCode" :label="$t('Itemno')" min-width="150"></el-table-column>
+              <el-table-column align="center" prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" min-width="150"></el-table-column>
               <el-table-column align="center" prop="taskName" :label="$t('xiangMuRenWu')" min-width="150"></el-table-column>
               <el-table-column align="center" prop="planHour" :label="$t('jiHuaGongShiH')" min-width="150"></el-table-column>
               <el-table-column align="center" prop="consumeTime" :label="$t('xiaoHaoGongShiH')" min-width="150"></el-table-column>
@@ -1578,7 +1578,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column prop="projectName" :label="$t('headerTop.projectName')" width="200"></el-table-column>
-                <el-table-column prop="projectCode" :label="$t('Itemno')" width="200"></el-table-column>
+                <el-table-column prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" width="200"></el-table-column>
                 <el-table-column prop="createDate" :label="$t('workovertimedate')" width="120"></el-table-column>
                 <el-table-column prop="workingTime" :label="$t('workinghoursoftheday')+ '(h)'" width="160"></el-table-column>
                 <el-table-column prop="overtimeHours" :label="$t('jia-ban-shi-chang')+ '(h)'" width="130"></el-table-column>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/packetConsumption/tables.vue

@@ -76,7 +76,7 @@
       </template>
       <template v-if="echartTableType == '表格'">
         <el-table :data="echartsTableData" border style="width: 100%" :height="(+tableHeight - 0) - 1" v-loading="echartsLoading" show-summary :summary-method="getSummaries">
-          <el-table-column prop="projectCode" label="项目编号"></el-table-column>
+          <el-table-column prop="projectCode" :label="user.companyId='7030' ? '项目令号' : '项目编号'"></el-table-column>
           <el-table-column prop="projectName" label="项目名称"></el-table-column>
           <el-table-column prop="workTime" label="时长(h)" width="180"></el-table-column>
         </el-table>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -68,7 +68,7 @@
                 <div class="poss-btn">
                     <el-radio-group v-model="possradio" size="small" @change="onYAxisChange" v-if="radio == $t('other.project')">
                         <el-radio-button label="1">{{ $t('headerTop.projectName') }}</el-radio-button>
-                        <el-radio-button label="2">{{ $t('Itemno') }}</el-radio-button>
+                        <el-radio-button label="2">{{ user.companyId == '7030' ? '项目令号' : $t('Itemno') }}</el-radio-button>
                     </el-radio-group>
                     <el-radio-group v-model="departmentadio" size="small" @change="departmentPersonnelSwitch" v-if="radio == $t('lable.department') && this.parentDeptId">
                         <el-radio-button label="1">{{ $t('lable.department') }}</el-radio-button>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/finance.vue

@@ -244,7 +244,7 @@
         <!--新增界面-->
         <el-dialog :title="title" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth" width="600px">
             <el-form ref="form1" :model="addForm" :rules="rules" label-width="100px">
-                <el-form-item :label="$t('Itemno')" >
+                <el-form-item :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" >
                     <el-input v-model="addForm.code" :placeholder="$t('Pleaseentertheprojectnumber')" clearable></el-input>
                 </el-form-item>
                 <el-form-item :label="$t('headerTop.projectName')" prop="name">

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/project/info.vue

@@ -28,7 +28,7 @@
                         </span></el-col>
                     </el-row>
                     <el-row :gutter="10">
-                        <el-col :span="5" ><span class="gray_label">{{ $t('Itemno') }}: </span></el-col><el-col :span="7" ><span >{{project.projectCode}}&nbsp;</span></el-col>
+                        <el-col :span="5" ><span class="gray_label">{{ user.companyId == '7030' ? '项目令号' : $t('Itemno') }}: </span></el-col><el-col :span="7" ><span >{{project.projectCode}}&nbsp;</span></el-col>
                         <el-col :span="5" v-if="permissions.projectContract"><span class="gray_label">{{ $t('contractamount') }}:</span></el-col>
                         <el-col :span="7" >
                         <span style="float:left;" v-if="permissions.projectContract">{{project.contractAmount == null?'-':project.contractAmount | numberToCurrency}} 元</span>
@@ -353,7 +353,7 @@
         <!--编辑基本信息界面-->
         <el-dialog :title="$t('jiebnxx')" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth" width="960px">
             <el-form ref="basicInfoForm" :model="addForm" :rules="rules" label-width="120px">
-                <el-form-item :label="$t('Itemno')" >
+                <el-form-item :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" >
                     <el-input v-model="addForm.code"  :placeholder="$t('peaseenterthe')" clearable :disabled="(!permissions.projectManagement && addForm.creatorId != user.id && !permissions.projectCodeAndName) || isShowProjectName"></el-input> 
                 </el-form-item>
                 <el-form-item :label="$t('headerTop.projectName')" prop="name">

+ 6 - 6
fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -12,7 +12,7 @@
                     <el-input v-model="keyword" class="input-with-select" @keyup.enter.native="searchList()" :placeholder="searchField == '1' ? $t('peaseenterthe') : $t('peaseenterthe')" clearable="true" size="small">
                         <el-select v-model="searchField" style="width:120px;"  slot="prepend" :placeholder="$t('defaultText.pleaseChoose')">
                             <el-option :label="$t('headerTop.projectName')" value=1 ></el-option>
-                            <el-option :label="$t('Itemno')" value=2 ></el-option>
+                            <el-option :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" value=2 ></el-option>
                         </el-select>
                         <el-button slot="append" @click="searchList" icon="el-icon-search"></el-button>
                     </el-input>
@@ -166,7 +166,7 @@
                         {{scope.$index+1+(page-1)*size}}
                     </template>
             </el-table-column> -->
-            <el-table-column prop="projectCode" :label="$t('Itemno')" sortable="custom" width="150"></el-table-column>
+            <el-table-column prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" sortable="custom" width="150"></el-table-column>
             <el-table-column prop="contractCode" :label="$t('contractno')" width="200" v-if="user.companyId == '936'">
                 <template slot-scope="scope">
                     <!-- <div v-if="scope.row.projectSeparate">
@@ -455,11 +455,11 @@
         <el-dialog :title="title" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth" width="960px" :top="'6vh'">
             <div style="height: 72vh;overflow-y: auto;overflow-x: hidden;">
                 <el-form ref="form1" :model="addForm" :rules="rules" label-width="120px">
-                    <el-form-item :label="$t('Itemno')" :class="title == $t('newproject')" v-if="user.companyId!=936">
+                    <el-form-item :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" :class="title == $t('newproject')" v-if="user.companyId!=936">
                         <!-- <el-input v-model="addForm.code" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目编号" clearable></el-input> -->
                         <el-input v-model="addForm.code" :placeholder="$t('peaseenterthe')" clearable :disabled="canOnlyModParticipator || (!permissions.projectManagement && addForm.creatorId != user.id && !permissions.projectCodeAndName)" maxlength="50" show-word-limit="true"></el-input>
                     </el-form-item>
-                    <el-form-item :label="$t('Itemno')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''" v-if="user.companyId==936" prop="code">
+                    <el-form-item :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''" v-if="user.companyId==936" prop="code">
                         <!-- <el-input v-model="addForm.code" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目编号" clearable></el-input> -->
                         <el-input v-model="addForm.code" :placeholder="$t('peaseenterthe')" clearable :disabled="canOnlyModParticipator || (!permissions.projectManagement && addForm.creatorId != user.id && !permissions.projectCodeAndName) || isShowProjectName" maxlength="50" show-word-limit="true"></el-input>
                     </el-form-item>
@@ -922,7 +922,7 @@
             <el-table ref="projectForSubCopy" border @cell-mouse-enter="hoverCall" @cell-mouse-leave="handCall" :cell-class-name="tableCellClassName" :data="forSubProjectlist" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;" @selection-change="checkedProlistForSub" @sort-change="tableSort">
                 <el-table-column type="selection" width="60" >
                 </el-table-column>
-                <el-table-column prop="projectCode" :label="$t('Itemno')"  width="150"></el-table-column>
+                <el-table-column prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')"  width="150"></el-table-column>
                 <el-table-column prop="projectName" :label="$t('headerTop.projectName')" min-width="250">
                 </el-table-column>
             </el-table>
@@ -937,7 +937,7 @@
         <el-dialog :title="$t('modifysubproject')" v-if="addSubProject" :visible.sync="addSubProject" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <el-form ref="form2" :model="temaddForm" :rules="rules" label-width="100px">
                 <!-- <el-form-item label="项目编号" prop="code"> -->
-                <el-form-item :label="$t('Itemno')">
+                <el-form-item :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')">
                     <el-input v-model="temaddForm.code" :placeholder="$t('peaseenterthe')" clearable></el-input>
                 </el-form-item>
                 <el-form-item :label="$t('headerTop.projectName')" prop="name">

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/project_gantt.vue

@@ -85,7 +85,7 @@
 
   <div class="demand-container" v-if="!isDataLoaded">
     <el-table height="90%" :loading="demandListLoading" :data="demandList">
-      <el-table-column :label="$t('Itemno')" prop="projectCode" width="160"></el-table-column>
+      <el-table-column :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" prop="projectCode" width="160"></el-table-column>
       <el-table-column :label="$t('headerTop.projectName')" prop="projectName" min-width="240"></el-table-column>
       <el-table-column :label="$t('jin-qi-ri-huo-yue-ren-yuan')" prop="activeUsers" min-width="240">
         <template slot-scope="scope">

+ 4 - 4
fhKeeper/formulahousekeeper/timesheet/src/views/projectApproval/projectApproval.vue

@@ -9,7 +9,7 @@
                     <el-input v-model="keyword" class="input-with-select" @keyup.enter.native="searchList" :placeholder="searchField == '1' ? $t('peaseenterthe') : $t('peaseenterthe')" clearable="true" size="small">
                         <el-select v-model="searchField" style="width:120px;"  slot="prepend" :placeholder="$t('defaultText.pleaseChoose')">
                             <el-option :label="$t('headerTop.projectName')" value=1 ></el-option>
-                            <el-option :label="$t('Itemno')" value=2 ></el-option>
+                            <el-option :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" value=2 ></el-option>
                         </el-select>
                         <el-button slot="append" @click="searchList" icon="el-icon-search"></el-button>
                     </el-input>
@@ -41,7 +41,7 @@
                     <el-table ref="projectlistOfWudulist" border @cell-mouse-enter="hoverCall" @cell-mouse-leave="handCall" :cell-class-name="tableCellClassName" :data="list" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;" @selection-change="checkedWudulist">
                         <el-table-column type="selection" width="60" :selectable="isSelectable">
                         </el-table-column>
-                        <el-table-column prop="projectCode" :label="$t('Itemno')"  width="150"></el-table-column>
+                        <el-table-column prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')"  width="150"></el-table-column>
                         <el-table-column prop="projectName" :label="$t('headerTop.projectName')" min-width="250" sortable="custom">
                         <template slot-scope="scope">
                             <div> 
@@ -106,7 +106,7 @@
                     <el-dialog :title="title" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth" width="960px" :top="'6vh'">
                         <div style="height: 72vh;overflow-y: auto;overflow-x: hidden;">
                             <el-form ref="form1" :model="addForm" :rules="rules" label-width="120px">
-                                <el-form-item :label="$t('Itemno')" :class="title == $t('newproject')" v-if="user.companyId!=936">
+                                <el-form-item :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')" :class="title == $t('newproject')" v-if="user.companyId!=936">
                                     <!-- <el-input v-model="addForm.code" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目编号" clearable></el-input> -->
                                     <el-input v-model="addForm.code" :placeholder="$t('peaseenterthe')" clearable :disabled="canOnlyModParticipator || (!permissions.projectManagement && addForm.creatorId != user.id && !permissions.projectCodeAndName)" maxlength="50" show-word-limit="true"></el-input>
                                 </el-form-item>
@@ -313,7 +313,7 @@
 
                     <!--查看立项-->
                     <el-dialog :title="$t('Checkthedetails')" v-if="projectApprovalDetailVisible" :visible.sync="projectApprovalDetailVisible" :close-on-click-modal="false" customClass="customWidth" width="400px">
-                        <div class="line"><span>{{'项目编号:'}}</span><span>{{projectApprocalDetail.projectCode}}</span></div>
+                        <div class="line"><span>{{user.companyId='7030' ? '项目令号:' : '项目编号:'}}</span><span>{{projectApprocalDetail.projectCode}}</span></div>
                         <div class="line"><span>{{'项目名称:'}}</span><span>{{projectApprocalDetail.projectName}}</span></div>
                         <div class="line"><span>{{'项目分类:'}}</span><span>{{projectApprocalDetail.categoryName}}</span></div>
                         <div class="line"><span>{{'项目类型:'}}</span><span>{{projectApprocalDetail.isPublic==0?"正式项目":"非项目"}}</span></div>

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/transferWorkingHours.vue

@@ -56,7 +56,7 @@
                                 </TranslationOpenDataText>
                             </template>
                         </el-table-column>
-                        <el-table-column align="center" prop="projectCode" :label="$t('Itemno')"
+                        <el-table-column align="center" prop="projectCode" :label="user.companyId == '7030' ? '项目令号' : $t('Itemno')"
                             width="240"></el-table-column>
                         <el-table-column align="center" prop="projectName" :label="$t('headerTop.projectName')"
                             width="240"></el-table-column>