Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into develop

src/views/plan/workbench/materialAnalysis/index.vue

@@ -7,6 +7,7 @@
 			<div class="material-top-right-wrap">
 				<Version
 				:withTheRingRadio="withTheRingRadio"
+				:transLabelObj="transLabelObj"
 				@versionEmit="versionEmit"
 				/>
 			</div>

src/views/plan/workbench/materialAnalysis/version/index.vue

@@ -11,7 +11,7 @@
 							placeholder="请选择">
 							<el-option v-for="item in getSpecifiedVersion"
 												:key="item['AP_CustDemandVerHead-VersionId']"
-												:label="item['AP_CustDemandVerHead-VersionId']"
+												:label="transLabelObj[item['AP_CustDemandVerHead-VersionId']]"
 												:value="item['AP_CustDemandVerHead-VersionId']" />
 						</el-select>
 					</el-form-item>
@@ -53,7 +53,7 @@
 							placeholder="请选择">
 							<el-option v-for="item in getSpecifiedVersion"
 												:key="item['AP_CustDemandVerHead-VersionId']"
-												:label="item['AP_CustDemandVerHead-VersionId']"
+												:label="transLabelObj[item['AP_CustDemandVerHead-VersionId']]"
 												:value="item['AP_CustDemandVerHead-VersionId']" />
 						</el-select>
 					</el-form-item>
@@ -88,7 +88,7 @@
 <script>
 import { get } from "@/server/api.js"
 export default {
-	props: ["withTheRingRadio"],
+	props: ["withTheRingRadio", "transLabelObj"],
 	data() {
 		return {
 			loading1: false,

src/views/plan/workbench/predictVersion/index.vue

@@ -12,7 +12,7 @@
             <el-option
               v-for="item in getSpecifiedVersion"
               :key="item['AP_CustDemandVerHead-VersionId']"
-              :label="item['AP_CustDemandVerHead-VersionId']"
+              :label="transLabelObj[item['AP_CustDemandVerHead-VersionId']]"
               :value="item['AP_CustDemandVerHead-VersionId']"
             />
           </el-select>
@@ -102,6 +102,7 @@
           show-overflow-tooltip
           :label="getColumnName('AP_CustArtlst-ArtId')"
           align="center"
+          width="120"
         >
           <template #default="scope">
             {{ scope.row["AP_CustArtlst-ArtId"] }}
@@ -111,6 +112,7 @@
           show-overflow-tooltip
           :label="getColumnName('AP_CustArtlst-Descr1')"
           align="center"
+          width="120"
         >
           <template #default="scope">
             {{ scope.row["AP_CustArtlst-Descr1"] }}
@@ -120,6 +122,7 @@
           show-overflow-tooltip
           :label="getColumnName('Article-ArtSize2')"
           align="center"
+          width="120"
         >
           <template #default="scope">
             {{ scope.row["Article-ArtSize2"] }}
@@ -129,6 +132,7 @@
           show-overflow-tooltip
           :label="getColumnName('Customer-CustomerId')"
           align="center"
+          width="120"
         >
           <template #default="scope">
             {{ scope.row["Customer-CustomerId"] }}
@@ -138,6 +142,7 @@
           show-overflow-tooltip
           :label="getColumnName('AP_CustArtlst-CustArtId')"
           align="center"
+          width="120"
         >
           <template #default="scope">
             {{ scope.row["AP_CustArtlst-CustArtId"] }}
@@ -147,6 +152,7 @@
           show-overflow-tooltip
           :label="getColumnName('Customer-FcustId')"
           align="center"
+          width="120"
         >
           <template #default="scope">
             {{ scope.row["Customer-FcustId"] }}
@@ -156,6 +162,7 @@
           show-overflow-tooltip
           :label="getColumnName('Customer-Name1')"
           align="center"
+          width="120"
         >
           <template #default="scope">
             {{ scope.row["Customer-Name1"] }}
@@ -165,6 +172,7 @@
           show-overflow-tooltip
           :label="getColumnName('AP_CustArtlst-LastUser')"
           align="center"
+          width="120"
         >
           <template #default="scope">
             {{ scope.row["AP_CustArtlst-LastUser"] }}
@@ -174,6 +182,7 @@
           show-overflow-tooltip
           :label="getColumnName('User-Name')"
           align="center"
+          width="120"
         >
           <template #default="scope">
             {{ scope.row["User-Name"] }}
@@ -182,8 +191,8 @@
         <el-table-column
           v-for="item in headers"
           :key="item"
-          :width="getRowWidth(item)"
-          :label="getColumnName(item)"
+          width="120"
+          :label="transLabelObj[getColumnName(item)]"
           :show-overflow-tooltip="true"
         >
           <template #default="scope">
@@ -217,6 +226,7 @@ export default {
       customerLoading: false,
       tableData1: [],
       getSpecifiedVersion: [],
+      transLabelObj: {},
     };
   },
   methods: {
@@ -338,8 +348,14 @@ export default {
         link.click();
       })
     },
+    getTransLabel() {
+			get('/user/week_to_date').then(({data})=>{
+				this.transLabelObj = data || {}
+			})
+		},
   },
   created() {
+    this.getTransLabel()
     this.getVersionOfCustom()
     this.pagination.pageSize = 100
   },

src/views/plan/workbench/predictionDeviation/index.vue

@@ -12,7 +12,7 @@
             <el-option
               v-for="item in getSpecifiedVersion"
               :key="item['AP_CustDemandVerHead-VersionId']"
-              :label="item['AP_CustDemandVerHead-VersionId']"
+              :label="transLabelObj[item['AP_CustDemandVerHead-VersionId']]"
               :value="item['AP_CustDemandVerHead-VersionId']"
             />
           </el-select>
@@ -27,7 +27,7 @@
             <el-option
               v-for="item in getSpecifiedVersion"
               :key="item['AP_CustDemandVerHead-VersionId']"
-              :label="item['AP_CustDemandVerHead-VersionId']"
+              :label="transLabelObj[item['AP_CustDemandVerHead-VersionId']]"
               :value="item['AP_CustDemandVerHead-VersionId']"
             />
           </el-select>
@@ -111,6 +111,7 @@
           show-overflow-tooltip
           :label="getColumnName('AP_CustArtlst-ArtId')"
           align="center"
+          width="120"
         >
           <template #default="scope">
             {{ scope.row["AP_CustArtlst-ArtId"] }}
@@ -120,6 +121,7 @@
           show-overflow-tooltip
           :label="getColumnName('AP_CustArtlst-Descr1')"
           align="center"
+          width="120"
         >
           <template #default="scope">
             {{ scope.row["AP_CustArtlst-Descr1"] }}
@@ -129,6 +131,7 @@
           show-overflow-tooltip
           :label="getColumnName('Customer-CustomerId')"
           align="center"
+          width="120"
         >
           <template #default="scope">
             {{ scope.row["Customer-CustomerId"] }}
@@ -138,6 +141,7 @@
           show-overflow-tooltip
           :label="getColumnName('Customer-Name1')"
           align="center"
+          width="120"
         >
           <template #default="scope">
             {{ scope.row["Customer-Name1"] }}
@@ -147,6 +151,7 @@
           show-overflow-tooltip
           :label="getColumnName('AP_CustArtlst-LastUser')"
           align="center"
+          width="120"
         >
           <template #default="scope">
             {{ scope.row["AP_CustArtlst-LastUser"] }}
@@ -156,6 +161,7 @@
           show-overflow-tooltip
           :label="getColumnName('User-Name')"
           align="center"
+          width="120"
         >
           <template #default="scope">
             {{ scope.row["User-Name"] }}
@@ -164,6 +170,7 @@
         <el-table-column
           show-overflow-tooltip
           align="center"
+          width="120"
         >
           <template #default="scope">
             {{ scope.row["title"] }}
@@ -172,8 +179,8 @@
         <el-table-column
           v-for="item in headers"
           :key="item"
-          :width="getRowWidth(item)"
-          :label="getColumnName(item)"
+          width="120"
+          :label="transLabelObj[getColumnName(item)]"
           :show-overflow-tooltip="true"
         >
           <template #default="scope">
@@ -207,6 +214,7 @@ export default {
       customerLoading: false,
       tableData1: [],
       getSpecifiedVersion: [],
+      transLabelObj: {},
     };
   },
   methods: {
@@ -326,8 +334,14 @@ export default {
         link.click();
       })
     },
+    getTransLabel() {
+			get('/user/week_to_date').then(({data})=>{
+				this.transLabelObj = data || {}
+			})
+		},
   },
   created() {
+    this.getTransLabel()
     this.getVersionOfCustom()
     this.pagination.pageSize = 100
   },