前端页面功能开发

imcs-ui/src/lang/zh/prepare.js

@@ -258,6 +258,7 @@ export default {
         materialType: '物料类型',
         factory: '生产分厂/制造商',
         productionType: '产品分类',
+		categoryType: '托盘类型',
 		fiveAxis: '是否五轴',
         period: '周期',
         num: '最大使用数量',

imcs-ui/src/views/zuihou/lineSideLibrary/inOutRecord/Index.vue

@@ -4,7 +4,7 @@
     <div class="filter-container">
     	<span>
     		<span>{{$t("lineSide.searchForm.name")}}：</span>
-    		<el-input v-model="queryParams.model.name" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
+    		<el-input v-model="queryParams.model.uniqueCode" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
     	</span>
     	<span style="margin-left: 15px;">
     		<span>{{$t("resource.searchForm.startEndTime")}}：</span>

imcs-ui/src/views/zuihou/machiningClient/touchScreen/Index.vue

@@ -489,13 +489,13 @@ export default {
             }else if(item.taskName.indexOf('下料')>-1){
                 if(item.taskName.indexOf('工序')>-1){
                   //工序下料
-                  item.uniqueCode = this.uniqueCode
-                  this.$refs.view3.setTenant(item)
-                  this.view3Visible = true
-                }else{                  
                   item.uniqueCode = this.uniqueCode
                   this.$refs.view6.setTenant(item)
                   this.view6Visible = true
+                }else{                  
+                  item.uniqueCode = this.uniqueCode
+                  this.$refs.view3.setTenant(item)
+                  this.view3Visible = true
                 }
             }else if(item.taskName.indexOf('热处理上料')>-1){
                 item.uniqueCode = this.uniqueCode
@@ -509,7 +509,9 @@ export default {
                 item.uniqueCode = this.uniqueCode
                 this.$refs.view7.setTenant(item)
                 this.view7Visible = true
-            }           
+            }  
+            //this.$refs.view4.setTenant(item)
+            //this.view4Visible = true         
         }         
 	  },
     viewClose() {

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

@@ -213,7 +213,8 @@
 	        total: 0
 	      },
 	      dicts: {
-		  BUSINESS_PRODUCT_TYPE: {},	
+		  BUSINESS_PRODUCT_TYPE: {},
+		  TRAY_CATEGORY_TYPE: {},	
           METERIAL_BRAND: {}  //工具材料品牌
         },
 	      enums: {
@@ -227,7 +228,7 @@
 	  	// 调用常量-审核状态
 	  	this.audioStatus = this.$constWKS.STATUSORTHERLIST
 	  	// 加载【字典】
-	  	initDicts(['BUSINESS_PRODUCT_TYPE'], this.dicts)		  
+	  	initDicts(['BUSINESS_PRODUCT_TYPE','TRAY_CATEGORY_TYPE'], this.dicts)		  
 	  	// 加载列表数据
 	  	this.fetch()
 		},

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

@@ -42,6 +42,11 @@
           <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.BUSINESS_PRODUCT_TYPE" />
         </el-select>
       </el-form-item>
+      <el-form-item :label="$t('prepare.table.tray.categoryType')" prop="categoryType">
+        <el-select style="width:100%"  :placeholder="$t('prepare.table.tray.categoryType')" v-model="tenant.categoryType.key" value>
+          <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.TRAY_CATEGORY_TYPE" />
+        </el-select>
+      </el-form-item>
 <!--      &lt;!&ndash;品牌&ndash;&gt;-->
 <!--    	<el-form-item :label='$t("prepare.table.tray.brand")+"："' prop="brand">-->
 <!--      	<el-select style="width:100%" :placeholder='$t("common.pleaseSelect")' v-model="tenant.brand.key" value>-->
@@ -121,6 +126,7 @@ export default {
       confirmDisabled: false,
       dicts: {
         BUSINESS_PRODUCT_TYPE: {},
+        TRAY_CATEGORY_TYPE: {},
 	      METERIAL_BRAND: {} //工具材料品牌
 	    },
       roles: [],
@@ -274,6 +280,9 @@ export default {
         productionType: {
           key: ''
         },
+        categoryType: {
+          key: ''
+        },
         fiveAxis: 0,
         status: '1',
         num: '1'

imcs-ui/src/views/zuihou/resourceProductMgr/resourcesMgr/components/TenantEdit.vue

@@ -155,6 +155,7 @@ export default {
     },
     save () {
       this.tenant.resourceId = this.rowData.id
+      this.tenant.moduleId = this.rowData.moduleId
       //this.tenant.isFinal = (this.tenant.isFinal=='1') ? 1 : 0
       console.log(this.tenant)
       resourceBusinessApi.save(this.tenant)