Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product

components/page/dataGrid.vue

@@ -130,7 +130,9 @@ export default {
       search: {
         pageIndex: 1,
         pageSize: 20,
-        conditions: []
+        conditions: [],
+        sortBy:null,
+        isDesc: true,
       },
       pageSizeOpts: [20, 50, 100],
       tableHeight: 0,

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
+      this.orderSearchForm.SkipCount =
+        (pageNum - 1) * this.orderSearchForm.MaxResultCount
+
       // pageData.pageIndex = pageNum
-        this.laodePage(pageData)
+      this.laodePage(this.orderSearchForm)
     },
     pageSizeChange(val) {
-        let pageData = this.search;
-        pageData.SkipCount = 0
-        pageData.MaxResultCount = val
-        this.laodePage(pageData)
+      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 => {
@@ -374,6 +380,9 @@ content="开工"
       },
       // 搜索
        tableSearch() {
+      this.orderSearchForm.SkipCount = 0
+      this.orderSearchForm.SimpleSearch = this.searchIterms
+      this.laodePage(this.orderSearchForm)
     },
       searchModel(){
         this.showModel = true;

pages/technology/details/index.vue

@@ -70,7 +70,7 @@ export default {
             });
           }
         },
-        { key: "taskSeq", title: this.l("taskSeq"), align: "left",width:80 },
+        { key: "taskSeq", title: this.l("taskSeq"), align: "left",width:100,sortable:true },
         {
           key: "name",
           title: this.l("name"),

pages/technology/details/routingqccard/index.vue

@@ -49,8 +49,9 @@ export default {
             "checkParams,standard",
           value: null
         },
-        routingHeaderId: { op: "Equal", value: -1 }
+        routingHeaderId: { op: "Equal", value: -1 },
       },
+      sortType: 'normal',
       modal: false,
       title: "新增",
       detail: null,
@@ -78,7 +79,8 @@ export default {
           title: this.l("routingDetailNo"),
           align: "left",
           high: true,
-          width: 80
+          width: 100,
+          sortable:true
         },
         {
           key: "routingDetailName",
@@ -357,7 +359,7 @@ export default {
     l(key) {
       let vkey = "routing_qc_card" + "." + key;
       return this.$t(vkey) || key;
-    }
+    },
   }
 };
 </script>

pages/technology/details/routingsupporting/index.vue

@@ -78,7 +78,8 @@ export default {
           title: this.l("routingDetailNo"),
           align: "left",
           high: true,
-          width: 80
+          width: 100,
+          sortable:true
         },
         {
           key: "routingDetailName",

pages/technology/index.vue

@@ -121,30 +121,7 @@ export default {
       uId: "",
       columns: [
         { key: "id", title: this.$t("id"), hide: true, align: "left" },
-        {
-          key: "creationTime",
-          title: this.$t("creationTime"),
-          align: "left",
-          hide: true
-        },
-        {
-          key: "creatorUserId",
-          title: this.$t("creatorUserId"),
-          align: "left",
-          hide: true
-        },
-        {
-          key: "lastModificationTime",
-          title: this.$t("lastModificationTime"),
-          align: "left",
-          hide: true
-        },
-        {
-          key: "lastModifierUserId",
-          title: this.$t("lastModifierUserId"),
-          align: "left",
-          hide: true
-        },
+       
         { key: "classId", title: this.l("classId"), align: "left", hide: true },
         {
           key: "unicode",
@@ -244,6 +221,30 @@ export default {
           width: 140,
           high: true,
           code: "Process.Status"
+        },
+         {
+          key: "creationTime",
+          title: this.$t("creationTime"),
+          align: "left",
+          hide: true
+        },
+        {
+          key: "creatorUserId",
+          title: this.$t("creatorUserId"),
+          align: "left",
+          hide: true
+        },
+        {
+          key: "lastModificationTime",
+          title: this.$t("lastModificationTime"),
+          align: "left",
+          hide: true
+        },
+        {
+          key: "lastModifierUserId",
+          title: this.$t("lastModifierUserId"),
+          align: "left",
+          hide: true
         },
         {
           title: "操作",