工单执行

i18n/locale/zh-CN.js

@@ -1117,6 +1117,8 @@ export default {
         resourceId: '设备',
         resourceType: '设备类型',
         runtime: '单件排产工时',
+        performancehours: '绩效工时',
+        
         setupTime: '工序准备工时',
         transportTime: '转运工时',
         checkTime: '检验工时',

pages/aps/dispatch/index.vue

@@ -366,17 +366,19 @@ export default {
     },
     // 打开抽屉
     openDrawer() {
+      let chekids = this.ids
+      let formData = this.listTask
+      let timebegin = formData[0].beginTime//: "2020-04-06 10:00:00"
+      let timend = formData[0].endTime//: "2020-04-06 10:00:00"
       if (this.button2 == '设备') {
+        this.entity.taskTime = [timebegin,timend]
         this.facilityModal = true
       } else {
+        this.pentity.taskTime = [timebegin,timend]
         this.manModal = true
       }
-      let chekids = this.ids
-      let formData = this.listTask
+      
       this.newList = []
-      let timebegin = formData[0].beginTime//: "2020-04-06 10:00:00"
-      let timend = formData[0].endTime//: "2020-04-06 10:00:00"
-      this.entity.taskTime = [timebegin,timend]
       chekids.forEach((v) => {
         var item = formData.filter((u) => {
           return u.id == v
@@ -392,8 +394,9 @@ export default {
       let item = this.newList
       item.map((u) => {
         u.userIds = this.entity.userIds
+        u.remark = this.entity.remark        
       })
-      console.log(item)
+      // console.log(item)
       this.$refs['formValidate'].validate((valid) => {
         if(valid){
           Api.saveTeamentry(item).then((res) => {
@@ -413,7 +416,9 @@ export default {
       let item = this.newList
       item.map((u) => {
         u.userIds = this.peploeId
+        u.remark = this.pentity.remark 
       })
+      // console.log(item)
        this.$refs['formpepole'].validate((valid) => {
         if(valid){
           Api.saveTeamentry(item).then((res) => {

pages/implement/components/sendCheck.vue

@@ -167,12 +167,13 @@ export default {
       var url = systemUrl + '/MyRole/GetRolesAsync?' + QS.stringify(params)
 
       service.get(`${url}`).then((response) => {
+       
         let roles = response.result.items
         let roleids = []
         for (let i = 0; i < roles.length; i++) {
           roleids.push(roles[i].id)
         }
-        let userInfo = this.$store.admin.user.info;
+       // let userInfo = this.$store.admin.user.info;
         // var url =
         //   `${systemUrl}/myuserrole/GetUsersByRoleAndorgan?ids=` +
         //   roleids.join(',') +
@@ -224,17 +225,8 @@ export default {
           }
         }
       }
-    },
-    getCurrentUser(e) {
-      if (e) {
-        let userInfo =this.$store.state.admin.user.info;
-        this.user.cardno = userInfo.login_id
-        this.user.user_name =userInfo.name
-        this.user.user_id = userInfo.userId
-      } else {
-        this.user.cardno = ''
-      }
     }
+    
   }
 }
 </script>
\ No newline at end of file

pages/implement/components/usercard.vue

@@ -238,11 +238,12 @@ export default {
     },
     getCurrentUser(e) {
       if (e) {
+        console.log(this.$store.state.admin.user.info);
         let userInfo = this.$store.state.admin.user.info;
       
-        this.user.cardno = userInfo.login_id
+        this.user.cardno = userInfo.cardNo
         this.user.user_name = userInfo.name
-        this.user.user_id = userInfo.userId
+        this.user.user_id = userInfo.id
       } else {
         this.user.cardno = ''
       }

pages/implement/index.vue

@@ -176,7 +176,7 @@
 import service from '@/plugins/request'
 import entryMovie from './components/entryMovie.vue'
 import entryrecordlist from './components/entryrecordlist.vue'
-import processview from '../processDesign/Process/processview.vue'
+import processview from '../processManage/Process/processview.vue'
 import productReport from './components/productReport.vue'
 import entryPause from './components/entryPause.vue'
 import materialDetail from '../resource/order/detail.vue'
@@ -222,22 +222,23 @@ export default {
         {
           title: '工艺名称',
           key: 'processname'
-        },
-        {
-          title: '料单板数',
-          key: 'platesnum',
-          render: (h, params) => {
-            if (this.data.routing_type == 2) {
-              return h('span', params.row.platesnum)
-            } else {
-              return h(
-                'span',
-
-                ''
-              )
-            }
-          }
         }
+        // ,
+        // {
+        //   title: '料单板数',
+        //   key: 'platesnum',
+        //   render: (h, params) => {
+        //     if (this.data.routing_type == 2) {
+        //       return h('span', params.row.platesnum)
+        //     } else {
+        //       return h(
+        //         'span',
+
+        //         ''
+        //       )
+        //     }
+        //   }
+        // }
       ],
       column1: [
         {
@@ -270,25 +271,25 @@ export default {
           key: 'quantity',
           width: '100'
         },
-        {
-          title: '每板数据',
-          key: 'picnumber',
-          width: '100',
-           render: (h, params) => {
-            if (this.data.routing_type == 2) {
-              return h(
-                'span',
+        // {
+        //   title: '每板数据',
+        //   key: 'picnumber',
+        //   width: '100',
+        //    render: (h, params) => {
+        //     if (this.data.routing_type == 2) {
+        //       return h(
+        //         'span',
 
-                params.row.picnumber
-              )
-            } else {
-              return h(
-                'span',
-                ''
-              )
-            }
-          }
-        }
+        //         params.row.picnumber
+        //       )
+        //     } else {
+        //       return h(
+        //         'span',
+        //         ''
+        //       )
+        //     }
+        //   }
+        // }
       ],
       fruit: [],
       currententry: null,
@@ -630,7 +631,7 @@ export default {
     this.loadProcessFile()
     if (this.data.routing_type == 2) {
       this.loadBill()
-      this.loadplatesnum()
+     // this.loadplatesnum()
     } else {
       this.processdata.push(this.data)
     }

pages/processManage/Process/processNew.vue

@@ -11,9 +11,9 @@
       <template slot-scope="{ row,index }" slot="is_outside">
         <state code="Process.Routing.Ststus" type="text" :value="row.is_outside"></state>
       </template>
-      <template slot-scope="{ row,index }" slot="check_flag">
+      <!-- <template slot-scope="{ row,index }" slot="check_flag">
         <state code="Process.Routing.checkflag" type="text" :value="row.check_flag"></state>
-      </template>
+      </template> -->
     </Table>
     <!-- 新增/编辑 工序弹框 -->
     <Modal
@@ -117,8 +117,13 @@
             <InputNumber v-model="formprocessValidate.check_time"></InputNumber>
           </FormItem>
 
-          <FormItem :label="l('checkFlag')" prop="checkFlag">
+          <!-- <FormItem :label="l('checkFlag')" prop="checkFlag">
             <Dictionary code="Process.Routing.checkflag" v-model="formprocessValidate.check_flag"></Dictionary>
+          </FormItem> -->
+
+
+ <FormItem :label="l('performancehours')" >
+            <InputNumber v-model="formprocessValidate.performance_hours"></InputNumber>
           </FormItem>
 
           <FormItem :label="l('efficiencyValue')" prop="efficiencyValue">
@@ -271,12 +276,17 @@ export default {
           key: 'check_time',
           title: this.l('checkTime')
         },
-        {
-          key: 'check_flag',
-          title: this.l('checkFlag'),
-          align: 'left',
-          slot: 'check_flag'
+         {
+          key: 'performance_hours',
+          title: this.l('performancehours')
         },
+        // {
+        //   key: 'check_flag',
+        //   title: this.l('checkFlag'),
+        //   align: 'left',
+        //   slot: 'check_flag'
+        // },
+        
         {
           key: 'efficiency_value',
           title: this.l('efficiencyValue')

pages/produce/components/table-list.vue

@@ -37,7 +37,7 @@
                 <span class="expand-value">{{ item.mesCode }}</span>
             </Col>
             <Col span="5">
-                <span class="expand-value">{{ item.productDrawnum+'-'+ item.productName }}</span>
+                <span class="expand-value">{{  item.productName }}</span>
             </Col>
             
             <Col span="2">

pages/qcimplement/index.vue

@@ -178,20 +178,20 @@ export default {
           title: '工艺名称',
           key: 'processname'
         },
-        {
-          title: '料单板数',
-          key: 'platesnum',
-          render: (h, params) => {
-            if (this.data.routing_type == 2) {
-              return h('span', params.row.platesnum)
-            } else {
-              return h(
-                'span',
-                ''
-              )
-            }
-          }
-        }
+        // {
+        //   title: '料单板数',
+        //   key: 'platesnum',
+        //   render: (h, params) => {
+        //     if (this.data.routing_type == 2) {
+        //       return h('span', params.row.platesnum)
+        //     } else {
+        //       return h(
+        //         'span',
+        //         ''
+        //       )
+        //     }
+        //   }
+        // }
       ],
       column1: [
         {
@@ -222,22 +222,22 @@ export default {
           key: 'quantity',
           width: '100'
         },
-        {
-          title: '每板数据',
-          key: 'picnumber',
-          width: '100',
-          render: (h, params) => {
-            if (this.data.routing_type == 2) {
-              return h(
-                'span',
-
-                params.row.picnumber
-              )
-            } else {
-              return h('span', '')
-            }
-          }
-        }
+        // {
+        //   title: '每板数据',
+        //   key: 'picnumber',
+        //   width: '100',
+        //   render: (h, params) => {
+        //     if (this.data.routing_type == 2) {
+        //       return h(
+        //         'span',
+
+        //         params.row.picnumber
+        //       )
+        //     } else {
+        //       return h('span', '')
+        //     }
+        //   }
+        // }
       ],
       getstate: [],
       hover_class: '',
@@ -552,7 +552,7 @@ export default {
     this.loadEntry(this.data.id)
     this.loadProcessFile()
     if (this.data.routing_type == 2) {
-      this.loadplatesnum()
+      //this.loadplatesnum()
     } else {
       this.processdata.push(this.data)
     }