工单执行

pages/processManage/Process/processNew.vue

@@ -122,7 +122,7 @@
           </FormItem> -->
 
 
- <FormItem :label="l('performancehours')" >
+ <FormItem :label="l('performanceHours')" >
             <InputNumber v-model="formprocessValidate.performance_hours"></InputNumber>
           </FormItem>
 
@@ -278,7 +278,7 @@ export default {
         },
          {
           key: 'performance_hours',
-          title: this.l('performancehours')
+          title: this.l('performanceHours')
         },
         // {
         //   key: 'check_flag',

pages/produce/taskList.vue

@@ -241,12 +241,14 @@ export default {
         SkipCount: 1,
         MaxResultCount: 10,
         orderSearchForm: {
+           status: 0,
+        SimpleSearch: '',
           productId: null, //产品id
           productName: '', //产品名称
           taskType: '', //任务类型
           stage: '', //阶段
           materialId: '', //材料
-          quantity: 1, //数量
+          
           guestName: '', //甲方客户
           printSupply: '', //3D打印承制单位
           functionaryOffice: '', //厂内责任机关
@@ -268,7 +270,9 @@ export default {
          
         projectNumber: "", //项目号
         batchNumber: "", //批次号
-        urgencyLevel: null //紧急程度
+        urgencyLevel: null, //紧急程度
+         SkipCount: 1,
+        MaxResultCount: 10
         },
         mColumn:[
           { type: 'expand',width: 60,
@@ -352,19 +356,21 @@ content="开工"
         });
       },
       // 分页
-      pageChange(pageNum) {
-        let pageData = this.search;
-        pageData.SkipCount = (pageNum - 1) * this.orderSearchForm.MaxResultCount
-        pageData.MaxResultCount = (pageNum - 1) * this.orderSearchForm.MaxResultCount
-        // pageData.pageIndex = pageNum
-        this.laodePage(pageData)
-      },
-      pageSizeChange(val) {
-        let pageData = this.search;
-        pageData.SkipCount = 0
-        pageData.MaxResultCount = val
-        this.laodePage(pageData)
-      },
+     
+
+ pageChange(pageNum) {
+      this.orderSearchForm.SkipCount =
+        (pageNum - 1) * this.orderSearchForm.MaxResultCount
+
+      // pageData.pageIndex = pageNum
+      this.laodePage(this.orderSearchForm)
+    },
+    pageSizeChange(val) {
+      this.orderSearchForm.SkipCount = 0
+      this.orderSearchForm.MaxResultCount = val
+      this.laodePage(this.orderSearchForm)
+    },
+
       laodePage(pageData){
         let url = `${PlanUrl}/orderexecute/waitexecuteorderlist`;
         service.post(`${url}`,pageData).then(res => {
@@ -373,8 +379,11 @@ content="开工"
         });
       },
       // 搜索
-      tableSearch() {
-      },
+       tableSearch() {
+      this.orderSearchForm.SkipCount = 0
+      this.orderSearchForm.SimpleSearch = this.searchIterms
+      this.laodePage(this.orderSearchForm)
+    },
       searchModel(){
         this.showModel = true;
       },