Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue

src/views/business/product/drawingForm.vue

@@ -40,8 +40,8 @@
         </el-table>
       </div>
       <!-- 分页 -->
-      <pagination v-show="total > 0" :total="total" v-model:page="form.pageNum" v-model:limit="form.pageSize"
-        @pagination="open" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryparams.pageNum" v-model:limit="queryparams.pageSize"
+        @pagination="getList" />
     </div>
 
     <el-dialog v-model="dialogVisible" width="1500px">
@@ -100,6 +100,11 @@ const loading = ref(false);
 const visible = ref(false);
 /** 查询对象 */
 const data = reactive({
+  queryparams:{
+    pageNum: 1,
+    pageSize: 10,
+    technologicalProcessDetailId: null
+  },
   form: {
     pageNum: 1,
     pageSize: 10,
@@ -112,23 +117,28 @@ const data = reactive({
     code: [{ required: true, message: "资源组编码不能为空", trigger: "blur" }],
   },
 });
-const { form, rules } = toRefs(data);
+const { form, rules,queryparams } = toRefs(data);
 
 /***********************  方法区  ****************************/
 /** 打开抽屉 */
 function open(row) {
 
   processDetail.value = row
-  loading.value = true;
+  queryparams.value.technologicalProcessDetailId = row.id
   form.value.technologicalProcessDetailId = row.id
-  listDrawing(form.value).then(res => {
+  getList()
+  visible.value = true;
+};
+/**查询列表 */
+function getList(){
+  loading.value = true;
+  listDrawing(queryparams.value).then(res => {
     form.value.drawingList = res.rows
     total.value = res.total
 
   })
   loading.value = false;
-  visible.value = true;
-};
+}
 /**
  * 打开操作页面
  */

src/views/business/product/recordsDialog.vue

@@ -65,6 +65,7 @@ const { queryParams } = toRefs(data)
  * 对话框打开 事件
  */
 function open(row) {
+  reset();
   visible.value = true
   if (row) {
     console.log(row)
@@ -84,6 +85,15 @@ function close() {
   visible.value = false
 }
 
+/** 表单重置 */
+function reset() {
+  queryParams.value = {
+    pageNum: 1,
+    pageSize: 10,
+  };
+  proxy.resetForm("formRef");
+}
+
 /**
  * 加载数据
  */

src/views/business/productionBatch/form.vue

@@ -29,7 +29,7 @@
                 @input="handleUpdateLotNumber"
                 :min="0"
               />
-              <el-button v-hasPermi="['business:productionBatch:outsourcedAdd']"
+              <el-button v-hasPermi="['business:productionBatch:outsourcedAdd']" :disabled="detailsRow.status"
                style="margin-left: 10px;" type="primary" @click="handleComputedMaterial"
         >外协投料计算</el-button>
             </el-form-item>