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

imcs-ui/src/views/zuihou/prepareProductMgr/frockMgr/Index.vue

@@ -78,15 +78,15 @@
       <el-table-column prop="materialType" :label='$t("prepare.table.tools.materialType")' :show-overflow-tooltip="true" width="150px"></el-table-column>
 
 	  <el-table-column prop="mapNo" :label='$t("prepare.table.tools.mapNo")' :show-overflow-tooltip="true" width="100px"></el-table-column>
-      <el-table-column prop="factory" :label="$t('prepare.table.tools.factory')" align="center" :show-overflow-tooltip="true" width="80px"></el-table-column>
+      <el-table-column prop="factory" :label="$t('prepare.table.tools.factory')" align="center" :show-overflow-tooltip="true" width="180px"></el-table-column>
       <el-table-column prop="expiryDate" :label="$t('prepare.table.tools.expiryDate')+' (月)'" align="center" :show-overflow-tooltip="true" width="100px"></el-table-column>
 	  <el-table-column prop="joinDate" :label='$t("prepare.table.tools.joinDate")' :show-overflow-tooltip="true" width="120px"></el-table-column>
 
       <!--<el-table-column prop="specification" :label='$t("prepare.table.tools.specification")' :show-overflow-tooltip="true" width="250px"></el-table-column>-->
 <!--      <el-table-column prop="brand.data" :label='$t("prepare.table.tools.brand")' align="center" :show-overflow-tooltip="true" width="120px"></el-table-column>-->
 <!--      <el-table-column prop="category.data" :label='$t("prepare.table.tools.category")' align="center" :show-overflow-tooltip="true" width="120px"></el-table-column>-->
-      <el-table-column prop="num" :label='$t("prepare.table.tools.num")' :show-overflow-tooltip="true" align="center" width="70px"></el-table-column>
-	  <el-table-column prop="status" :label='$t("prepare.table.tools.status")' align="center" width="100px">
+      <el-table-column prop="num" :label='$t("prepare.table.tools.num")' :show-overflow-tooltip="true" align="center" width="170px"></el-table-column>
+	  <el-table-column prop="status" :label='$t("prepare.table.tools.status")' align="center" >
       	<template slot-scope="{ row }">
           <el-tag :type="row.status=='1' ? 'success' : 'danger'">
           	{{ row.status=='1' ? $t("common.status.valid") : $t("common.frozen") }}

imcs-ui/src/views/zuihou/prepareProductMgr/frockMgr/components/Edit.vue

@@ -171,24 +171,30 @@ export default {
 	    },
       roles: [],
       rules: {
-        name: [
-        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
-        ],
-        model: [
-        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
+        no: [
+          { required: true, message: this.$t("rules.require"), trigger: 'blur' },
         ],
-        category: [
+        name: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
         ],
+        // model: [
+        // 	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
+        // ],
+        // category: [
+        // 	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
+        // ],
         joinDate: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
         ],
         materialType: [
           { required: true, message: this.$t("rules.require"), trigger: 'blur' },
         ],
-        brand: [
-        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
+        num: [
+          { required: true, message: this.$t("rules.require"), trigger: 'blur' },
         ],
+        // brand: [
+        // 	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
+        // ],
       }
     }
   },
@@ -259,9 +265,6 @@ export default {
         category: {
           key: ''
         },
-        materialType: {
-          key: ''
-        },
         brand: {
           key: ''
         },
@@ -333,16 +336,16 @@ export default {
 	        })
 				return
     	} */
-    	if(this.tenant.model ==''){
-        console.log(this.$t("prepare.tips.inputGg"))
-    		this.$message({
-	          message: this.$t("prepare.tips.inputGg"),
-	          type: 'warning'
-	        })
-				return
-    	}
+    	// if(this.tenant.model ==''){
+      //   console.log(this.$t("prepare.tips.inputGg"))
+    	// 	this.$message({
+	    //       message: this.$t("prepare.tips.inputGg"),
+	    //       type: 'warning'
+	    //     })
+			// 	return
+    	// }
     	// 添加规格数据
-    	this.tenant.mtoolMeterialSpecsList = this.tableData
+    	// this.tenant.mtoolMeterialSpecsList = this.tableData
     	//console.log("Form数据：", this.tenant)
       this.$refs.form.validate((valid) => {
         if (valid) {

imcs-ui/src/views/zuihou/prepareProductMgr/trayMgr/Index.vue

@@ -89,7 +89,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        :label="$t('table.operation')"
+        :label="$t('table.operation')"l
         fixed="right"
         align="center"
         column-key="operation"