guoyujia 2 months ago
parent
commit
be99bc4f6b

+ 1 - 1
src/views/business/returnTurnover/index.vue

@@ -198,7 +198,7 @@ function resetQuery() {
 /** 修改周转按钮操作 */
 /** 修改周转按钮操作 */
 function handleShowTurnoverDialog(row) {
 function handleShowTurnoverDialog(row) {
 	console.log(row)
 	console.log(row)
-	proxy.$refs.dialogReturnTurnoverRef.open(row)
+	//proxy.$refs.dialogReturnTurnoverRef.open(row)
 	//判断当前发出明细是否已经被收回审核
 	//判断当前发出明细是否已经被收回审核
 	if(row.returnReceiptDetailList[0].status == 0){
 	if(row.returnReceiptDetailList[0].status == 0){
 		proxy.$modal.msgError('当前批次未收回审核,暂时无法周转')
 		proxy.$modal.msgError('当前批次未收回审核,暂时无法周转')

+ 4 - 4
src/views/business/reviseBath/index.vue

@@ -2,14 +2,14 @@
   <div class="page-container column-container">
   <div class="page-container column-container">
     <!-- 搜索区 -->
     <!-- 搜索区 -->
     <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
     <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
-      <el-form-item label="计划单号:">
-        <el-input placeholder="请输入计划单号" @keydown.enter.prevent @keyup.enter="handleQuery" clearable
-          v-model="queryParams.productionPlanNo"  @blur="handleTrimQuarms" style="width: 160px" />
-      </el-form-item>
       <el-form-item label="产品描述:">
       <el-form-item label="产品描述:">
         <el-input placeholder="请输入产品描述" @keydown.enter.prevent @keyup.enter="handleQuery" clearable
         <el-input placeholder="请输入产品描述" @keydown.enter.prevent @keyup.enter="handleQuery" clearable
           v-model="queryParams.productDescription"  @blur="handleTrimQuarms" style="width: 160px" />
           v-model="queryParams.productDescription"  @blur="handleTrimQuarms" style="width: 160px" />
       </el-form-item>
       </el-form-item>
+      <el-form-item label="计划单号:">
+        <el-input placeholder="请输入计划单号" @keydown.enter.prevent @keyup.enter="handleQuery" clearable
+          v-model="queryParams.productionPlanNo"  @blur="handleTrimQuarms" style="width: 160px" />
+      </el-form-item>
       <el-form-item label="批号状态:" label-width="100px">
       <el-form-item label="批号状态:" label-width="100px">
         <el-select v-model="queryParams.lotCodeStatusCode" clearable placeholder="请选择批号状态" style="width: 150px">
         <el-select v-model="queryParams.lotCodeStatusCode" clearable placeholder="请选择批号状态" style="width: 150px">
           <el-option v-for="dict in lot_code_status_code" :key="dict.value" :label="dict.label"
           <el-option v-for="dict in lot_code_status_code" :key="dict.value" :label="dict.label"