Quellcode durchsuchen

解决自动化节点配置访问权限功能

oyq28 vor 3 Jahren
Ursprung
Commit
3b85a36796

+ 2 - 1
imcs-ui/src/lang/zh/resource.js

@@ -62,7 +62,8 @@ export default {
 			isStatus: '具备状态',
 			isProStaus: '产线控制状态',
 			maxTime: '每日最多加工',
-			baoyang: '临近保养'
+			baoyang: '临近保养',
+			isAutoCode: '是否工序节点'
 		},
 		// 按钮的名称
 	  	buttons: {

+ 2 - 2
imcs-ui/src/views/zuihou/resourceProductMgr/resourcesMgr/Index.vue

@@ -138,7 +138,7 @@
 	            @click="editHardware(row)"
 	          />
           </el-tooltip>
-		  <el-tooltip class="item" :content='$t("resource.buttons.autoCode")' effect="dark" placement="top-start">
+		  <el-tooltip class="item" :content='$t("resource.buttons.autoCode")' effect="dark" placement="top-start" v-if="row.isAutoCode=='1'">
 	          <i
 	            class="el-icon-place table-operation"
 	            style="color: #2db7f5;"
@@ -191,7 +191,7 @@
       @success="editDetailConfSuccess"
     />
 	
-	<el-dialog
+	<el-dialog	       
 		  :title='$t("resource.buttons.autoCode")'
 		  :visible.sync="autoCodeVisible"
 		  width="80%"

+ 1 - 1
imcs-ui/src/views/zuihou/resourceProductMgr/resourcesMgr/components/AutoCode.vue

@@ -32,7 +32,7 @@
 	  <el-table-column prop="isFinal" label='是否线终序' align="center" width="150px">
 		  <template slot-scope="{ row }">
           <el-tag>
-          	{{ row.isFinal ? "是" : "否" }}
+          	{{ row.isFinal=='1' ? "是" : "否" }}
           </el-tag>
         </template>
 	  </el-table-column>    

+ 7 - 0
imcs-ui/src/views/zuihou/resourceProductMgr/resourcesMgr/components/Edit.vue

@@ -53,6 +53,13 @@
       <el-form-item :label='$t("resource.searchForm.baoyang")+":"' prop="stopTaskHours">
       		<el-input-number v-model="tenant.stopTaskHours" :min="1" :max="10"></el-input-number>
       		<span>{{ $t("resource.common.stopTaskHours") }}</span>
+      </el-form-item>
+       <!-- 是否工序节点 -->
+      <el-form-item :label='$t("resource.searchForm.isAutoCode")+":"' prop="productionLineControl">
+        <template>
+				  <el-radio v-model="tenant.isAutoCode" label="1">{{$t("common.yes")}}</el-radio>
+				  <el-radio v-model="tenant.isAutoCode" label="0">{{$t("common.no")}}</el-radio>
+				</template>
       </el-form-item>
       <!-- 是否显示 -->
       <el-form-item :label='$t("resource.common.displayStatus")+":"' prop="displayStatus">

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

@@ -20,8 +20,8 @@
       </el-form-item>      
       <el-form-item label='是否最终序' prop="isFinal">
         <template>
-				  <el-radio v-model="tenant.isFinal" :label="true">是</el-radio>
-				  <el-radio v-model="tenant.isFinal" :label="false">否</el-radio>
+				  <el-radio v-model="tenant.isFinal" label="1">{{$t("common.yes")}}</el-radio>
+				  <el-radio v-model="tenant.isFinal" label="0">{{$t("common.no")}}</el-radio>
 				</template>
       </el-form-item>
       <el-form-item :label='$t("resource.table.area.remark")+":"' prop="remark">
@@ -93,7 +93,7 @@ export default {
         id: '',
         name: '',
         status: '1',
-        isFinal: true,
+        isFinal: '1',
         remark: '',   
       }
     },
@@ -138,6 +138,8 @@ export default {
     },
     save () {
       this.tenant.resourceId = this.rowData.id
+      //this.tenant.isFinal = (this.tenant.isFinal=='1') ? 1 : 0
+      console.log(this.tenant)
       resourceBusinessApi.save(this.tenant)
         .then((response) => {
           const res = response.data
@@ -158,7 +160,7 @@ export default {
         })
     },
     update () {  
-      this.tenant.isFinal = (this.tenant.isFinal) ? "1" : "0"
+      //this.tenant.isFinal = (this.tenant.isFinal) ? "1" : "0"
       resourceBusinessApi.update(this.tenant)
         .then((response) => {
           const res = response.data