Merge pull request '根据需求修改部分表单' (#71) from xuxiaoming into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/71

build_prod.sh

@@ -29,4 +29,11 @@ cd $DIST_DIT
 zip -q -r $ZIP_NAME ./
 
 echo "\033[32m 压缩完成，文件名  ${ZIP_NAME} \033[0m"
-echo "\033[32m 编译完成，文件在 ${DIST_DIT}${ZIP_NAME} \033[0m"
+
+
+cp ${DIST_DIT}${ZIP_NAME} "/Users/denny/Desktop/${ZIP_NAME}"
+
+echo "\033[32m 编译完成，文件在桌面${ZIP_NAME} \033[0m"
+
+echo "\033[32m 切换回到${CURRENT_BRANCH} \033[0m"
+(git checkout $CURRENT_BRANCH) >/dev/null 2>&1

src/views/factoryModel/factoryDefine/addOrEdit.vue

@@ -4,14 +4,14 @@
              width="1000px"
              :close-on-click-modal="false"
              :before-close="cancel">
-    <el-form ref="formData" :model="formData" :rules="rules" label-width="120px" v-loading="loading">
+    <el-form ref="formData" :model="formData" :rules="rules" label-width="140px" v-loading="loading">
       <el-row>
         <el-col :span="8">
 					<el-form-item :label="getColumnName('Plant-PlantNr')" prop="Plant-PlantNr">
 						<el-input-number v-model="formData['Plant-PlantNr']" :disabled="isAddOrEdit == 'edit'" placeholder="请输入" />
 					</el-form-item>
 				</el-col>
-				<el-col :span="8">
+				<!-- <el-col :span="8">
 					<el-form-item :label="getColumnName('Plant-Status')" prop="Plant-Status">
 						<el-select v-model="formData['Plant-Status']"
                        filterable
@@ -22,7 +22,7 @@
                          :value="item['Stdef-StdefTyp']" />
             </el-select>
 					</el-form-item>
-				</el-col>
+				</el-col> -->
 				<el-col :span="8">
 					<el-form-item :label="getColumnName('Plant-Name1')" prop="Plant-Name1">
 						<el-input v-model="formData['Plant-Name1']" placeholder="请输入" />
@@ -100,7 +100,7 @@
 						<el-input v-model="formData['Plant-CompanyAddress']" placeholder="请输入" />
 					</el-form-item>
 				</el-col>
-				<el-col :span="8">
+				<!-- <el-col :span="8">
 					<el-form-item :label="getColumnName('Plant-TaxId')">
 						<el-input v-model="formData['Plant-TaxId']" placeholder="请输入" />
 					</el-form-item>
@@ -119,7 +119,7 @@
 					<el-form-item :label="getColumnName('Plant-Currency')">
 						<el-input v-model="formData['Plant-Currency']" placeholder="请输入" />
 					</el-form-item>
-				</el-col>
+				</el-col> -->
 				<el-col :span="8">
 					<el-form-item :label="getColumnName('Plant-CapacityPercentageToggle')">
 						<el-switch v-model="formData['Plant-CapacityPercentageToggle']" active-color="#13ce66" inactive-color="#ff4949"></el-switch>

src/views/factoryModel/part/material/addOrEdit.vue

@@ -97,7 +97,7 @@
               <el-option
                 v-for="item in attributeArray"
                 :key="item['Attribute-AttrCode']"
-                :label="item['Attribute-Descr']"
+                :label="item['Attribute-AttrName']"
                 :value="item['Attribute-AttrCode']"
               />
             </el-select>

src/views/factoryModel/part/material/index.vue

@@ -95,6 +95,9 @@
 						<span v-if="item === 'Article-PlantNr'">{{ getWorkshopName(scope.row["Article-PlantNr"]) }}</span>
             <span v-else-if="item === 'Article-ProjectId'">{{ projectIdText(scope.row["Article-ProjectId"]) }}</span>
 						<span v-else-if="item === 'Article-ArtTypeId'">{{ artSpecListText(scope.row["Article-ArtTypeId"]) }}</span>
+            <span v-else-if="item === 'Article-ArtSpec1'">{{
+                  mappingText(attributeArray, scope.row["Article-ArtSpec1"], 'Attribute-AttrCode', 'Attribute-AttrName')
+            }} </span>
             <span v-else>{{ scope.row[item] }}</span>
           </template>
         </el-table-column>
@@ -153,6 +156,7 @@ import { ListMixin } from "@/mixins/ListMixin";
 import AddOrEdit from "./addOrEdit.vue";
 import BomConfigure from './BOMConfigure.vue';
 import { getProjectList } from "@/server/factoryModel/material";
+import { getAttributeList } from "@/server/factoryModel/standardProperties";
 export default {
 	components: {
     AddOrEdit,
@@ -166,6 +170,7 @@ export default {
   },
   data() {
     return {
+      attributeArray:[],
 			queryTableDataUrl: "/admin/base/article/query",
       // 默认字段
       headers: [
@@ -175,6 +180,7 @@ export default {
         "Article-Descr2",
         "Article-ProjectId",
         "Article-ArtTypeId",
+        "Article-ArtSpec1",
         "Article-ArtSpec2",
         "Article-ArtSpec3",
         // "Article-ArtTypeId",
@@ -268,8 +274,18 @@ export default {
       );
       return item?.["Stdef-Bez"] || value
     },
+    		// 获取标准属性定义
+		getAttributeData() {
+			getAttributeList().then(({ code, data=[] }) => {
+        if (code == 200) {
+          this.attributeArray = data
+        }
+      })
+		}
 	},
+  
 	created() {
+    this.getAttributeData()
     this.getProjectList()
     this.getArtSpecList()
   },

src/views/factoryModel/resource/secondaryResources/addOrEdit.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="标准定义"
+    title="次要资源"
     model-value
     width="1000px"
     :close-on-click-modal="false"
@@ -102,14 +102,14 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item :label="getColumnName('AP_SecondaryResource-DayAvailHours')" prop="AP_SecondaryResource-DayAvailHours">
             <el-input-number
               v-model="formData['AP_SecondaryResource-DayAvailHours']"
               placeholder="请输入"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         
       </el-row>
     </el-form>