diff --git a/src/pages/Middle/Mold/Touch/Reporting.vue b/src/pages/Middle/Mold/Touch/Reporting.vue
index b4db592..780b9d0 100644
--- a/src/pages/Middle/Mold/Touch/Reporting.vue
+++ b/src/pages/Middle/Mold/Touch/Reporting.vue
@@ -176,7 +176,7 @@
             </a-tab-pane>
             <a-tab-pane key="2" tab="即将超时布产列表" force-render>
               <vxe-table border show-overflow keep-source ref="xTable3" :height="715" :row-config="{ height: 80 }"
-                :data="poData">
+                :data="poData" @cell-dblclick="cellDblclick1">
                 <vxe-column title="操作" width="90">
                   <template #default="{ row }">
                     <a-button @click="selectPoInfo(row)">选择</a-button>
@@ -196,6 +196,7 @@
                 </vxe-column>
                 <vxe-column field="mold_detail" formatter="formatRef" :params="{ dataType: 'object', textField: 'name' }"
                   title="模具" width="400"></vxe-column>
+                <vxe-column field="remark" title="备注" width="160"></vxe-column>
               </vxe-table>
 
 
@@ -215,9 +216,12 @@
               <!-- 完工筛选 -->
               <a-select @select="IsCompleteChange" :value="IsCompleteDefault" style="width: 200px"
                 :options="IsCompleteOptions"></a-select>
-
+              <a-select @select="IsMasterChange" :value="IsMasterDefault" style="width: 200px"
+                :options="IsMasterOptions"></a-select>
+                <a-select @select="IsEngineerChange" :value="IsEngineerDefault" style="width: 200px"
+                :options="IsEngineerOptions"></a-select>
               <vxe-table border show-overflow keep-source ref="xTable3" :height="715" :row-config="{ height: 80 }"
-                :data="detailDataProgress">
+                :data="detailDataProgress" @cell-dblclick="cellDblclick">
                 <vxe-column title="操作" width="90">
                   <template #default="{ row }">
                     <a-button @click="selectPoProgressInfo(row)">选择</a-button>
@@ -279,7 +283,25 @@
 
 
     </div>
-
+    <vxe-modal v-model="showRowEditDialog" width="600" :position="{top:'20%'}" title="添加布产备注" show-footer>
+      <template #default>
+        <p style="font-size: 20px;font-weight: bold;">布产单号:{{ nowRow.code }}</p>
+        <a-textarea v-model="nowRow.remark" :rows="4" style="font-size: 20px;"/>
+      </template>
+      <template #footer>
+        <a-button @click="saveRowRemark">确认</a-button>
+      </template>
+    </vxe-modal>
+    <vxe-modal v-model="showProcessEditDialog" width="600" :position="{top:'20%'}" title="添加工序备注" show-footer>
+      <template #default>
+        <p style="font-size: 20px;font-weight: bold;">布产单号:{{ nowProcessRow.production_code }}</p>
+        <p style="font-size: 20px;font-weight: bold;">工序:{{ nowProcessRow.process_detail.name }}</p>
+        <a-textarea v-model="nowProcessRow.remark" :rows="4" style="font-size: 20px;"/>
+      </template>
+      <template #footer>
+        <a-button @click="saveRemark">确认</a-button>
+      </template>
+    </vxe-modal>
 
 
 
@@ -346,6 +368,10 @@ export default {
       keyName: 'id',
       // 是否编辑模式
       isEdit: false,
+      showProcessEditDialog:false,
+      showRowEditDialog:false,
+      nowRow: {},
+      nowProcessRow: {},
       currentId: 0,
       detailsData: [],  // 工序详情列表
       detailsData3: [],  // 部门列表
@@ -379,8 +405,21 @@ export default {
           value: "1",
         }
       ],  // 是否完成下拉框
-
-
+      user_list: [], // 员工列表
+      IsMasterDefault: "0",
+      IsMasterOptions: [
+        {
+          label: "全部模具师傅",
+          value: "0",
+        }
+      ],
+      IsEngineerDefault: "0",
+      IsEngineerOptions: [
+        {
+          label: "全部工程师傅",
+          value: "0",
+        }
+      ],
       processesIsSend: "1", // 按是否已发料筛选
       IsSendDefault: "1",
       IsSendOptions: [
@@ -594,6 +633,7 @@ export default {
       if (this.tabKey == '3') {
         this.loadDataProgress(0, 0);
         this.loadDeaprtmentData();
+        this.loadUserData();
       }
     },
     loadPoData() {
@@ -659,6 +699,53 @@ export default {
 
       });
     },
+    loadUserData(){
+      this.$mk.post({
+        url: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`,
+        loading: "加载中...",
+        data: {
+          "beid": parseInt(process.env.VUE_APP_BEID),
+          "ptyid": 0,
+          "company_id": parseInt(process.env.VUE_APP_COMPANY_ID),
+          "store_id": 0,
+          "project_token": process.env.VUE_APP_APPTOKEN,
+          "company_token": process.env.VUE_APP_COMPANYTOKEN,
+          "search_rules": [
+          ],
+          "end_time": 0,
+          "order_bys": [],
+          "limit": 100,
+          "page": 1,
+          "start_time": 0
+        },
+        useBigInt: true,
+      }).then(a => {
+        this.user_list = a.data.MesStaff;
+        // 将department_list 中的name值赋值给department_list_options
+        this.IsMasterOptions = this.user_list.map(item => {
+          console.log(item.id)
+          return {
+            value: item.id,
+            label: item.name
+          }
+        })
+        this.IsEngineerOptions = this.user_list.map(item => {
+          return {
+            value: item.id,
+            label: item.name
+          }
+        })
+        // 将department_list_options 前面加上全部
+        this.IsMasterOptions.unshift({
+          label: "全部模具师傅",
+          value: 0,
+        })
+        this.IsEngineerOptions.unshift({
+          label: "全部工程师傅",
+          value: 0,
+        })
+      });
+    },
     selectPoInfo(row) {
       this.loadProductionOrder({ id: row.id })
     },
@@ -744,6 +831,20 @@ export default {
           "value": "0"
         })
       }
+      // if (this.processesIsMaster > 0) {
+      //   search_rules.push({
+      //     "column": "mold_master_uid",
+      //     "mode": "=",
+      //     "value": this.processesIsMaster
+      //   })
+      // } 
+      // if (this.processesIsEngineer > 0) {
+      //   search_rules.push({
+      //     "column": "engineer_uid",
+      //     "mode": "=",
+      //     "value": this.processesIsEngineer
+      //   })
+      // } 
       this.loading = true
       this.$mk.post({
         url: `${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/processes/list`,
@@ -762,7 +863,9 @@ export default {
           "page": 1,
           "limit": 200,
           "start_time": 0,
-          "end_time": 0
+          "end_time": 0,
+          mold_master_uid:this.processesIsMaster,
+          engineer_uid:this.processesIsEngineer,
         },
         useBigInt: true,
       }).then(a => {
@@ -1195,7 +1298,87 @@ export default {
       this.processesIsSend = e
       this.IsSendDefault = e
       this.loadDataProgress()
-    }
+    },
+    IsMasterChange(e){
+      this.processesIsMaster = e
+      this.IsMasterDefault = e
+      this.loadDataProgress()
+      console.log(e)
+    },
+    IsEngineerChange(e){
+      this.processesIsEngineer = e
+      this.IsEngineerDefault = e
+      this.loadDataProgress()
+      console.log(e)
+    },
+    cellDblclick({ row, column }){
+      console.log(row,column)
+      this.nowProcessRow = Object.assign({}, row);
+      this.showProcessEditDialog = true;
+    },
+    cellDblclick1({ row, column }){
+      console.log(row,column)
+      this.nowRow = Object.assign({}, row);
+      this.showRowEditDialog = true;
+    },
+    saveRemark(){
+     
+      this.$mk.post({
+        url: `${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/saveProcessRemark`,
+        loading: "操作中...",
+        data: {
+          "ptyid": parseInt(process.env.VUE_APP_PTYID),
+          "project_token": process.env.VUE_APP_APPTOKEN,
+          "store_id": 0,
+          "beid": parseInt(process.env.VUE_APP_BEID),
+          "company_token": process.env.VUE_APP_COMPANYTOKEN,
+          "id": this.$mk.toBigInt(this.nowProcessRow.id),
+          "company_id": parseInt(process.env.VUE_APP_COMPANY_ID),
+          "remark": this.nowProcessRow.remark
+        },
+        useBigInt: true,
+      }).then(a => {
+        console.log(a)
+        if (a.code == 200) {
+          this.$mk.success("操作成功");
+          this.loadProductionOrder({ id: this.currentId, resetProcesses: true });
+          this.showProcessEditDialog = false;
+
+        }else{
+          this.showProcessEditDialog = false;
+        }
+      })
+
+    },
+    saveRowRemark(){
+     
+     this.$mk.post({
+       url: `${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/saveRemark`,
+       loading: "操作中...",
+       data: {
+         "ptyid": parseInt(process.env.VUE_APP_PTYID),
+         "project_token": process.env.VUE_APP_APPTOKEN,
+         "store_id": 0,
+         "beid": parseInt(process.env.VUE_APP_BEID),
+         "company_token": process.env.VUE_APP_COMPANYTOKEN,
+         "id": this.$mk.toBigInt(this.nowRow.id),
+         "company_id": parseInt(process.env.VUE_APP_COMPANY_ID),
+         "remark": this.nowRow.remark
+       },
+       useBigInt: true,
+     }).then(a => {
+       console.log(a)
+       if (a.code == 200) {
+         this.$mk.success("操作成功");
+         this.loadProductionOrder({ id: this.currentId, resetProcesses: true });
+         this.showRowEditDialog = false;
+
+       }else{
+         this.showRowEditDialog = false;
+       }
+     })
+
+   }
 
 
   },