浏览代码

新增测试

Lexie 1 年之前
父节点
当前提交
beff43e668

+ 9 - 5
src/view/performance/06-packingDocuments/index.vue

@@ -711,11 +711,15 @@ const updateDetailData = async() => {
 // 新增数据
 const handleShowAdd = async() => {
   type.value = '新增'
-  
-  await getTableInfo(currentRow.value?.UniqId)
-  // 默认日期为前一天的日期
-  const date = dayjs().subtract(1, 'day').format('YYYY-MM-DD')
-  detailData.sczl_rq = date
+  if(currentRow.value.UniqId==null){
+	  dialogFormVisible.value = true
+  }else{
+	  
+	  await getTableInfo(currentRow.value?.UniqId)
+	  // 默认日期为前一天的日期
+	  const date = dayjs().subtract(1, 'day').format('YYYY-MM-DD')
+	  detailData.sczl_rq = date
+  }
 }
 const addDetailData = async() => {
   const restoredData = {

+ 3 - 2
src/view/performance/09-workOrderVerification/index.vue

@@ -1081,9 +1081,10 @@ const handleSelectChange = (row, column, event) => {
 // 新增数据
 const handleShowAdd = async() => {
   type.value = '新增'
-  // console.log()
-  getDetailData(minUniqId.value)
+  console.log(minUniqId.value)
 
+  getDetailData(minUniqId.value)
+  
   // type.value='add'
   //    Object.assign(detailData);
   // dialogFormVisible.value = true

+ 1 - 2
src/view/performance/chejianbaogong.vue

@@ -12,7 +12,6 @@
 			<el-button type="primary" size="large"class="bt" @click="onyinban">印版领退</el-button>
 			<el-button type="primary" size="large"class="bt" @click="onClear" >换型清场</el-button>
 			<el-button type="primary" size="large"class="bt" @click="oncomplaints" >客诉记录</el-button>
-
 		</div>
 		</header>
 
@@ -3508,7 +3507,7 @@ const FieldInspectionRecord = async () => {
 const GetMachineMac = async (addr) => {
   console.log(addr);
   const response = await getMachineMac({ addr: addr });
-  // const response = await getMachineMac({ addr: '68-ED-A4-26-5D-5E' });
+  // const response = await getMachineMac({ addr: '00-E0-4D-77-31-9E' });
   // const response = await getMachineMac({ addr: '68-ED-A4-26-5D-90' });
   // const response = await getMachineMac({ addr: '68-ED-A4-26-5E-50' });
   // const response = await getMachineMac({ addr: '68-ED-A4-26-60-CC' });

+ 17 - 9
src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -2,16 +2,18 @@
   <div>
     
 	    <header>
-			<el-button type="primary" @click="onBZ">班组维护</el-button>
-			<el-button type="primary" @click="onzhicheng"  >制程检验</el-button>
-			<el-button type="primary" @click="onxuncha">管理巡查</el-button>
-			<el-button type="primary" @click="ondianjian">设备点检</el-button>
-			<el-button type="primary" @click="onyinban">印版领退</el-button>
+			<el-button type="primary" class="bt" @click="onBZ">班组维护</el-button>
+			<el-button type="primary" class="bt" @click="onzhicheng"  >制程检验</el-button>
+			<el-button type="primary" class="bt" @click="onxuncha">管理巡查</el-button>
+			<el-button type="primary" class="bt" @click="ondianjian">设备点检</el-button>
+			<el-button type="primary" class="bt" @click="onyinban">印版领退</el-button>
 			<!-- <el-button type="primary" @click="onstatus" >设置机台状态</el-button> -->
-			<el-button type="primary" @click="oncomplaints" >客诉记录</el-button>
-			<el-button type="primary" @click="onClear" >换型清场</el-button>
-			<el-button type="primary" @click="onDel"  v-if="DelType === true" >删除</el-button>
-			<el-button type="primary" @click="onADD" v-if="AddType === true">新增</el-button>
+			<el-button type="primary" class="bt" @click="oncomplaints" >客诉记录</el-button>
+			<el-button type="primary" class="bt" @click="onClear" >换型清场</el-button>
+			<el-button type="primary" class="bt" @click="onDel"  v-if="DelType === true" >删除</el-button>
+			<el-button type="primary" class="bt" @click="onADD" v-if="AddType === true">新增</el-button>
+			<el-button type="primary" class="bt" @click="onADD" v-if="AddType === true">核算参数调整</el-button>
+			<el-button type="primary" class="bt" @click="onADD" v-if="AddType === true">修正核算参数</el-button>
 			<!-- <el-button type="primary" @click="onClear2" >换型清场</el-button> -->
 		</header>
 		
@@ -1821,6 +1823,12 @@
 		      <span style="margin-top: 8px;">{{ item.设备编号 + ' - ' + item.设备名称 }}</span>
 		    </button>
 		  </div>
+		</el-dialog>
+		
+		
+		<el-dialog v-model="hesuanVisible" :before-close="closehesuanVisible" title="核算参数调整"
+		  destroy-on-close width="80%" style="height: 100%;">
+		  
 		</el-dialog>
 		
 		<Shebeizhuangtai