瀏覽代碼

Merge branch '250217外协发出一键选择工序,报工维护修改,分选包装后自动周转' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue into 250217外协发出一键选择工序,报工维护修改,分选包装后自动周转

ezhizao_zx 4 月之前
父節點
當前提交
df7832f2e3

+ 2 - 0
src/views/business/firstOutsource/index.vue

@@ -202,6 +202,8 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   proxy.resetForm("queryRef");
+  getNowDate();
+  getPassDate();
   handleQuery();
 }
 

+ 2 - 0
src/views/business/innerOutsource/index.vue

@@ -223,6 +223,8 @@ function resetQuery() {
   proxy.resetForm("queryRef");
   queryParams.value = {};
   innerOutsourceStore().setInnerOutsourceQueryParams(null);
+  getNowDate();
+  getPassDate();
   handleQuery();
 }
 

+ 2 - 0
src/views/business/outsource/index.vue

@@ -205,6 +205,8 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   proxy.resetForm("queryRef");
+  getNowDate();
+  getPassDate();
   handleQuery();
 }
 

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

@@ -104,7 +104,7 @@
 					</el-table-column>
 					<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="64">
 						<template #default="scope">
-							<el-button v-if="scope.row.flag" link type="warning" icon="Edit"
+							<el-button v-if="scope.row.flag && scope.row.productionDeptId != -1" link type="warning" icon="Edit"
 								@click="handleShowTurnoverDialog(scope.row)"> 编辑 </el-button>
 						</template>
 					</el-table-column>