From 0a14e0cd18aac5dae21e4f723a8ae8153493257c Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Wed, 8 Jan 2025 20:11:48 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=8D=95=E6=8D=AE=E5=9B=9E=E4=BC=A0?=
 =?UTF-8?q?=EF=BC=8C=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/flow_manage/act/execution/index.vue   | 12 +++++++
 .../wms/pm_manage/feedback_data/index.vue     | 31 +++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue
index b733063d..6ba09041 100644
--- a/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue
+++ b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue
@@ -31,6 +31,17 @@
             class="filter-item"
           />
         </el-form-item>
+        <el-form-item label="子流程ID">
+          <el-input
+            v-model="query.child_id"
+            clearable
+            style="width: 250px"
+            size="mini"
+            placeholder="请输入子流程ID"
+            prefix-icon="el-icon-search"
+            class="filter-item"
+          />
+        </el-form-item>
         <rrOperation />
       </el-form>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -203,6 +214,7 @@ import ViewDialog from '@/views/wms/flow_manage/act/execution/ViewDialog.vue'
 
 const defaultForm = {
   proc_inst_id: null,
+  child_id: null,
   parent_id: null,
   deployment_id: null,
   activity_id: null,
diff --git a/wms_pro/qd/src/views/wms/pm_manage/feedback_data/index.vue b/wms_pro/qd/src/views/wms/pm_manage/feedback_data/index.vue
index 5dbb93f8..3b44779b 100644
--- a/wms_pro/qd/src/views/wms/pm_manage/feedback_data/index.vue
+++ b/wms_pro/qd/src/views/wms/pm_manage/feedback_data/index.vue
@@ -45,6 +45,27 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="物料编码">
+            <el-input
+              v-model="query.mater"
+              clearable
+              style="width: 250px"
+              size="mini"
+              placeholder="请输入物料编码"
+              prefix-icon="el-icon-search"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-form-item label="单据日期" prop="analyseData">
+            <el-date-picker
+              v-model="query.datepick"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            />
+          </el-form-item>
           <template v-for="(col,index) in cols" v-if="hideShowDialog">
             <el-form-item label="col.lable">
               <label slot="label">{{ col.lable }}:</label>
@@ -213,6 +234,7 @@ const defaultForm = {
   biz_date: null,
   form_type: null,
   status: null,
+  mater: null,
   create_time: null,
   create_name: null,
   material_id: null,
@@ -282,6 +304,15 @@ export default {
   },
   methods: {
     [CRUD.HOOK.beforeRefresh]() {
+      if (this.query.datepick) {
+        this.query.start_time = this.query.datepick[0]
+        if (this.query.datepick.length > 1) {
+          this.query.end_time = this.query.datepick[1]
+        }
+      } else {
+        this.query.start_time = ''
+        this.query.end_time = ''
+      }
       if (this.fromTypes.length > 0) {
         formstruc.getHeader(this.query.form_type).then(res => {
           this.cols = res