任务列表

assets/css/base.less

@@ -866,7 +866,7 @@ html [type=button] {
 }
 
 .waitTask {/*flex 布局*/    
-    display: flex;
+    display: flex!important;
     align-items: center;
     width: 200px;
     height: 100px;

pages/implement/components/entryrecordlist.vue

@@ -420,8 +420,8 @@ export default {
         this.datasearch.entryID
 
       service.get(`${url}`).then((response) => {
-        this.product_List = response.data.result
-        this.board_List = response.data.result
+        this.product_List = response.result
+        this.board_List = response.result
 
         for (let i = 0; i < this.product_List.length; i++) {
           let obj = this.product_List[i]

pages/implement/components/processRecord.vue

@@ -4,10 +4,10 @@
     <Form
       ref="cardModeldata"
       :model="cardModeldata"
-      :rules="ruleValidate"
       :label-width="120"
       inline
     >
+    <!-- :rules="ruleValidate" -->
       <Row>
         <Col span="12">
           <FormItem label="设备编号">
@@ -143,7 +143,7 @@ export default {
         `${PlanUrl}/orderexecutefiles/getbyentryid?entryId=` + this.dispatch_id
 
       service.get(`${url}`).then((response) => {
-        this.cardModeldata = response.data.result[0]
+        this.cardModeldata = response.result[0]
         ;(this.cardModeldata.dispatch_id = this.dispatch_id),
           (this.cardModeldata.execute_id = this.execute_id),
           (this.cardModeldata.order_id = this.order_id)
@@ -165,7 +165,7 @@ export default {
         `${systemUrl}/equipinfo/getbyid?Id=` + this.cardModeldata.equip_id
 
       service.get(`${url}`).then((response) => {
-        let obj = response.data.result
+        let obj = response.result
         this.equipCode = obj.equip_id
         this.equipName = obj.equip_name
         this.equipTypeName = obj.equip_winname
@@ -177,7 +177,7 @@ export default {
         this.cardModeldata.equip_id
 
       service.get(`${url}`).then((response) => {
-        let obj = response.data.result
+        let obj = response.result
         this.fileTempUrlPath = fileUrlDown + obj.file
       })
     },
@@ -207,7 +207,7 @@ export default {
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
             this.loaddata()
             this.cleardata()

pages/implement/components/sendCheck.vue

@@ -73,7 +73,7 @@ export default {
         checker: 0,
         check_time: null
       },
-
+      isall:[],
       isMain: 1,
       productisabled: false,
       product_ID: [],
@@ -117,7 +117,7 @@ export default {
         service
           .post(`${url}`, JSON.stringify(this.user))
           .then((response) => {
-            if (response.data.success) {
+            if (response.success) {
               this.$Message.success('保存成功')
               this.$parent.$parent.loadproduct()
               this.$parent.$parent.sendCheckModal = false
@@ -152,8 +152,8 @@ export default {
         this.user.dispatch_id
 
       service.post(`${url}`).then((response) => {
-        this.product_List = response.data.result
-        this.board_List = response.data.result
+        this.product_List = response.result
+        this.board_List = response.result
       })
     },
     loaduser() {
@@ -167,7 +167,7 @@ export default {
       var url = systemUrl + '/MyRole/GetRolesAsync?' + QS.stringify(params)
 
       service.get(`${url}`).then((response) => {
-        let roles = response.data.result.items
+        let roles = response.result.items
         let roleids = []
         for (let i = 0; i < roles.length; i++) {
           roleids.push(roles[i].id)
@@ -182,8 +182,8 @@ export default {
           `${systemUrl}/myuserrole/GetUsersByRole?ids=` + roleids.join(',')
 
         service.get(`${url}`).then((response) => {
-          for (let j = 0; j < response.data.result.length; j++) {
-            let user = response.data.result[j]
+          for (let j = 0; j < response.result.length; j++) {
+            let user = response.result[j]
             var index = this.checkerlist.filter(function(item) {
               return item.id === user.id
             })

pages/implement/index.vue

@@ -48,6 +48,10 @@
             </div>
           </div>
         </div>
+        <div class="dd" v-if="!entryData">
+          <!-- .length=0 -->
+          暂无数据
+        </div>
         <div
           @click="groupClick(item,index)"
           :class="item.id==currentID?'hover':'card_box'"
@@ -369,6 +373,7 @@ export default {
       this.currententry = null
       var url = `${PlanUrl}/orderexecute/getentrylist?ExecuteId=` + ExecuteId
       service.get(`${url}`).then((response) => {
+        console.log("数据",response)
         this.entryData = response.result.entryList
         this.entryHistoryData = this.entryData
         let data = []
@@ -450,7 +455,9 @@ export default {
         }
       })
     },
-
+    detailOk(){
+      console.log("配套")
+    },
     loadBill() {
       var url =
         `${designUrl}/orderbillrel/getorderbilllistbyorders?orderids=` +

pages/implement/table.less

@@ -24,7 +24,8 @@
     float       : left;
     width       : 310px;
     margin-right: 15px;
-    height      : calc(100% - 16px);
+    // height      : calc(100% - 16px);
+    height: 500px;
     border      : 1px solid #e4e6ed;
     overflow-y  : auto;
     overflow-x  : hidden;