Ver código fonte

测试问题修改

yejian 3 anos atrás
pai
commit
44f9af47a4

+ 3 - 3
imcs-ui/src/lang/zh/machining.js

@@ -97,15 +97,15 @@ export default {
         unqualifiedCount: '不合格零件',
         qualifiedCount: '合格零件',
         addOrderCount: '补单次数',
-		orderDeliveryTime: '交货日期',
+		    orderDeliveryTime: '交货日期',
         createTime: '下单日期'
 			},
 			qualityResult: {
 				no: '单据编号',
         orderNo: '订单编号',
-		orderName: '订单名称',
+		    orderName: '订单名称',
         workpieceName: '零件名称',
-        uniqueCode: '唯一码',
+        uniqueCode: ' 零件唯一码',
         procedureNo: '检测序',
         okFlag:'检测结果',
         measuringReport:'检测报告',

+ 16 - 16
imcs-ui/src/views/zuihou/agvMgr/workRecord/Index.vue

@@ -12,16 +12,16 @@
           size="medium"
         />
       </span>
-      <!--订单编号
-      <span>
-        <span>{{ $t("agv.searchForm.orderNo") }}:</span>
-        <el-input
-          v-model="queryParams.model.orderNo"
-          :placeholder='$t("common.pleaseEnter")'
-          style="width: 150px;"
-          size="medium"
-        />-->
-      </span>
+<!--      &lt;!&ndash;订单编号&ndash;&gt;-->
+<!--      <span>-->
+<!--        <span>{{ $t("agv.searchForm.orderNo") }}:</span>-->
+<!--        <el-input-->
+<!--          v-model="queryParams.model.orderNo"-->
+<!--          :placeholder='$t("common.pleaseEnter")'-->
+<!--          style="width: 150px;"-->
+<!--          size="medium"-->
+<!--        />-->
+<!--      </span>-->
       <!--零件名称-->
       <span>
         <span>{{ $t("agv.searchForm.partName") }}:</span>
@@ -111,12 +111,12 @@
         :label='$t("agv.table.agv.orderName")'
       :show-overflow-tooltip="true"
       />
-      <!--订单编号
-      <el-table-column
-        prop="orderNo"
-        :label='$t("agv.table.agv.orderNo")'
-        :show-overflow-tooltip="true"
-      />-->
+<!--      &lt;!&ndash;订单编号&ndash;&gt;-->
+<!--      <el-table-column-->
+<!--        prop="orderNo"-->
+<!--        :label='$t("agv.table.agv.orderNo")'-->
+<!--        :show-overflow-tooltip="true"-->
+<!--      />-->
       <!--零件名称-->
       <el-table-column
         prop="partName"

+ 4 - 4
imcs-ui/src/views/zuihou/prepareProductMgr/cuttingToolApplyMgr/Index.vue

@@ -14,10 +14,10 @@
     		<span>{{$t("cuttingToolApply.searchForm.partName")}}:</span>
     		<el-input v-model="queryParams.model.partName" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
     	</span>
-      <span style="margin-left: 15px;">
-    		<span>{{$t("cuttingToolApply.searchForm.partsAlias")}}:</span>
-    		<el-input v-model="queryParams.model.partsAlias" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
-    	</span>
+<!--      <span style="margin-left: 15px;">-->
+<!--    		<span>{{$t("cuttingToolApply.searchForm.partsAlias")}}:</span>-->
+<!--    		<el-input v-model="queryParams.model.partsAlias" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+<!--    	</span>-->
       <span style="margin-left: 15px;">
     		<span>{{$t("cuttingToolApply.searchForm.processStatus")}}:</span>
     		<el-select v-model="queryParams.model.processStatus" :placeholder='$t("common.pleaseSelect")' size="medium" style="width: 150px;">

+ 3 - 3
imcs-ui/src/views/zuihou/qualityCenter/qualityResult/Index.vue

@@ -58,17 +58,17 @@
       </el-table-column>
       <!-- 订单名称 -->
       <el-table-column prop="orderName" :label='$t("machining.table.qualityResult.orderName")' :show-overflow-tooltip="true"></el-table-column>
-      <!-- 订单编号 
+      <!-- 订单编号
       <el-table-column prop="orderNo" :label='$t("machining.table.qualityResult.orderNo")' :show-overflow-tooltip="true"></el-table-column> -->
       <!-- 零件名称 -->
       <el-table-column prop="workpieceName" :label='$t("machining.table.qualityResult.workpieceName")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 零件编号 -->
       <el-table-column prop="uniqueCode" :label='$t("machining.table.qualityResult.uniqueCode")'  :show-overflow-tooltip="true"></el-table-column>
       <!-- 工序名称 -->
-      <el-table-column prop="procedureNo" :label='$t("machining.table.qualityResult.procedureNo")' :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="procedureName" :label='$t("machining.table.qualityResult.procedureNo")' :show-overflow-tooltip="true"></el-table-column>
       <!-- X -->
       <el-table-column prop="okFlag" :label='$t("machining.table.qualityResult.okFlag")' :show-overflow-tooltip="true"></el-table-column>
-      <!-- Y 
+      <!-- Y
       <el-table-column prop="measuringReport" :label='$t("machining.table.qualityResult.measuringReport")' :show-overflow-tooltip="true"></el-table-column> -->
       <!-- 所属计划 -->
       <el-table-column prop="createTime" :label='$t("machining.table.qualityResult.createTime")' :show-overflow-tooltip="true"></el-table-column>