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

pages/produce/ordermaterial.vue

@@ -365,12 +365,10 @@ export default {
       params.SkipCount = params.SkipCount || 0
       params.MaxResultCount = params.MaxResultCount || 10
 
-      let url =
-        `${designUrl}/orderrouting/getwaitmaterialorderlist?` +QS.stringify(params)
-      
+      let url =`${designUrl}/orderrouting/getwaitmaterialorderlist?` + QS.stringify(params)
       service.get(`${url}`).then((res) => {
-        this.mDatas = res.data.result.items
-        this.search.total = res.data.result.totalCount
+        this.mDatas = res.result.items
+        this.search.total = res.result.totalCount
       })
     },
     columnChange(item, i) {
@@ -396,6 +394,7 @@ export default {
       let id = data.materialbillId
       let url02 = `${designUrl}/ordermaterial/getbyid?id=` + id
       service.get(`${url02}`).then((res) => {
+        console.log(res)
         this.orderMaterial = res.data.result.orderMaterialList
         this.rowData = res.data
       })
@@ -419,7 +418,7 @@ export default {
     // 高级查询
     complexSearch() {
       this.orderSearchForm.SkipCount=0;
-this.laoedPage()
+      this.laoedPage()
       this.close()
     }
   },

pages/produce/orderscheduling.vue

@@ -369,8 +369,12 @@ export default {
         '&MaxResultCount=' +
         pageData.MaxResultCount
       service.get(`${url}`).then((res) => {
-        this.mDatas = res.data.result.items
-        this.search.total = res.data.result.totalCount
+        if(res.success){
+          this.mDatas = res.result.items
+          this.search.total = res.result.totalCount
+        }else{
+          this.$Message.error("查询失败")
+        }
       })
     },
     columnChange(item, i) {

pages/qc/dataTrace/components/reviewCount.vue

@@ -193,13 +193,13 @@ export default {
 <style scoped>
 .menuBg{
     background: none;
-    height: 550px;
+    height: 630px;
 }
 .menuBg .ivu-menu-item{
     color: #000;
 }
 .revieweBox{
     padding: 0 0 0 60px;
-    height: 550px;
+    height: 630px;
 }
 </style>
\ No newline at end of file

pages/qc/dataTrace/index.vue

@@ -278,8 +278,9 @@ export default {
           "MaxResultCount": 20,
           "SkipCount": 1, 
         }).then(res => {
-          this.listTask = res.data.result.items
-          this.search.total = res.data.result.totalCount
+          // console.log(res)
+          this.listTask = res.result.items
+          this.search.total = res.result.totalCount
         });
       },
       reviewFn(item){ //追溯
@@ -382,9 +383,9 @@ export default {
         let url = `${PlanUrl}/orderexecute/pageddatamesorders`;
         // console.log(parmes)
         service.post(`${url}`,parmes).then(res => {
-          console.log(res)
-          this.listTask = res.data.result.items
-          this.search.total = res.data.result.totalCount
+          // console.log(res)
+          this.listTask = res.result.items
+          this.search.total = res.result.totalCount
           if(this.search.total == 0){
             this.noData = true
           }else{
@@ -450,7 +451,7 @@ ul,li{
   line-height: 800px;
 }
 .card{
-  width: 388px;
+  width: 375px;
   margin: 10px 0 10px 20px;
 }
 .wu_data{
@@ -471,6 +472,6 @@ ul,li{
   border-top: 1px solid #ccc;
   display: block;
   padding: 10px 0 0 0;
-  color: #249E91;
+  color: #0099FF;
 }
 </style>
\ No newline at end of file

pages/qc/taskList/index.vue

@@ -292,8 +292,8 @@ export default {
           "skipCount":0,
           "maxResultCount": 10
         }).then(res => {
-            this.mDatas = res.data.result.items
-            this.search.total = res.data.result.totalCount
+            this.mDatas = res.result.items
+            this.search.total = res.result.totalCount
         });
       },
       // 分页

pages/resourceManagement/deviceType/index.vue

@@ -193,8 +193,7 @@ export default {
     laodaction(name) {
       let url = `${systemUrl}/equiptype/getpaged`;
       service.get(`${url}`, { params: { equip_type_name: name } }).then(res => {
-        // console.log(res)
-        this.data1 = res.data.result.items;
+        this.data1 = res.result.items;
       });
     },