部件工时统计新增bom展开

陈翱
1 parent 744e168b
Showing 4 changed files with 658 additions and 12 deletions
src/api/api.js
src/views/system/CostCalculate.vue
src/views/working/PartWorking.vue
src/views/working/modules/PartBomList.vue
@@ -175,6 +175,7 @@ export const getApiNameList = (params)=&gt;getAction(&quot;/api_log/apiLog/getApiNameLis
 export const queryProcess = (params)=>getAction('/plm/partlib/list', params);
 export const queryPBom2 = (params)=>getAction('/plm/partlib/bomTree', params);
 export const queryPBomByWms = (params)=>getAction('/pbom/pbom/treeList', params);
+export const partList = (params)=>getAction('/working/working/partList', params);
 export const queryOrderPBomByWms = (params)=>getAction('/pbom/pbom/orderTreeList', params);
 export const queryCnoList = (params)=>getAction('/pbom/pbom/queryCnoList', params);
 export const getWorkOrderList = (params)=>getAction('/workorder/workorder/getWorkOrderList', params);
@@ -55,6 +55,10 @@
             <a>成本核算</a>
           </a-popconfirm>
         </span>
+
+      <span slot="getNoPrece" slot-scope="text, record">
+            <a @click="getNoPrece(record)">{{record.excel_flag}}</a>
+        </span>
     </a-table>
  
  
@@ -123,6 +127,15 @@
     <pbom-form ref="pbomForm"></pbom-form>
     <materia-item-list ref="materiaFrom"></materia-item-list>
     <PreparationList ref="modalForm2"></PreparationList>
+
+    <j-popup
+      v-show="showRentPrise"
+      ref="no_price"
+      code="getNoPrece"
+      :param="materialParam"
+      org-fields="username"
+      dest-fields="popup"
+      field="popup"/>
   </a-card>
 </template>
  
@@ -145,6 +158,7 @@ export default {
     return {
       selectIndex: null,
       queryParam: {},
+      materialParam:{workno:''},
       description: '项目C表信息',
       // 表头
       url: {
@@ -220,7 +234,15 @@ export default {
           title: '是否上传',
           align: 'center',
           dataIndex: 'excel_flag',
-          key: 'excel_flag'
+          key: 'excel_flag',
+          scopedSlots:{
+            customRender:'getNoPrece'
+          }
+        }, {
+          title: '核算次数',
+          align: 'center',
+          dataIndex: 'account',
+          key: 'account'
         },
         {
           title: '操作',
@@ -287,14 +309,11 @@ export default {
           }
         },
         {
-          title: '库存',
-          dataIndex: 'qty',
+          title: '成本(元)',
+          dataIndex: 'price',
           align: 'center',
-          key: 'qty',
-          width: 70,
-          scopedSlots: {
-            customRender: 'checkQty'
-          },
+          key: 'price',
+          width: 70
         }
         // , {
         //   title: '物料状态',
@@ -325,7 +344,16 @@ export default {
     },
   },
   methods: {
+    getNoPrece(data){
+      this.materialParam['workno'] ="''"+data.field0056+"''";
+      this.$refs.no_price.openModal();
+    },
     costCalcuate(record){
+      if (record.excel_flag==undefined){
+        this.$message.warn("请先上传excel,再核算成本");
+        return false;
+      }
+      this.$message.info("开始后台计算成本,计算完成会发送系统通知!!")
       let params = {
         'workno': record.field0056,
         'uuids': record.field0057 + ',' + record.field0054 + ',' + record.field0055
-<script src="../../permission.js"></script>
+<script>
+import PartBomList from "./modules/PartBomList";
+export default {
+  components: {PartBomList}
+}
+</script>
 <template>
   <a-card :bordered="false">
     <!-- 查询区域 -->
@@ -58,6 +63,10 @@
         <span slot="processWorking" slot-scope="text, record">
             <a @click="processWorking(record)">{{record.time}}</a>
         </span>
+
+        <span slot="partBom" slot-scope="text, record">
+            <a @click="partBom(record)">{{record.partNo}}</a>
+        </span>
       </a-table>
  
     </div>
@@ -96,6 +105,8 @@
       dest-fields="popup"
       field="popup"/>
     <materia-item-list ref="materiaFrom"></materia-item-list>
+    <part-bom-list ref="partBom"></part-bom-list>
+
   </a-card>
 </template>
  
@@ -103,15 +114,15 @@
 import { getPartWorkList,getProjectSum} from '@api/api'
 import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 import { downFile } from '@/api/manage'
-import {ajaxGetDictItems} from "../../api/api";
 import MateriaItemList from "../system/modules/MateriaItemList";
+import PartBomList from "./modules/PartBomList";
  
  
  
 export default {
   name: 'PartWorking',
   mixins: [JeecgListMixin],
-  components: {MateriaItemList},
+  components: {MateriaItemList,PartBomList},
   data() {
     return {
       materialParam:{code:''},
@@ -154,7 +165,10 @@ export default {
           title: '部件号',
           align: 'center',
           dataIndex: 'partNo',
-          ellipsis: true
+          ellipsis: true,
+          scopedSlots:{
+            customRender:'partBom'
+          }
         },
         {
           title: '进度',
@@ -221,6 +235,9 @@ export default {
     this.loadFrom();
   },
   methods: {
+    partBom(data){
+      this.$refs.partBom.edit(data);
+    },
     findCarNumberClick(row){
       this.field0056=row.field0056;
       this.field0054=row.field0054;
+<template>
+  <a-modal
+    title="部件BOM"
+    :width="1600"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 85%;overflow-y: hidden">
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+
+    <p3>项目名称:{{projectName}}</p3>
+    <a-table
+      :scroll="{x: scrollXWidth, y: 720}"
+      ref="table"
+      size="middle"
+      rowKey="id"
+      :columns="planColumns"
+      :dataSource="bomSource"
+      :pagination="false"
+      :loading="loading2"
+      :expandedRowKeys="expandedRowKeys"
+      :rowSelection="{selectedRowKeys: selectedRowKeys,onChange: selectChanges}"
+      @change="handleTableChange"
+      @expand="handleExpand"
+      v-bind="tableProps" >
+
+
+    </a-table>
+    <!-- table区域-end -->
+    <pbom-form ref="pbomForm"></pbom-form>
+    <materia-item-list ref="materiaFrom"></materia-item-list>
+  </a-card>
+  </a-modal>
+</template>
+
+<script>
+import { JeecgListMixin } from '../../../mixins/JeecgListMixin'
+import moment from 'moment'
+import {ajaxGetDictItems, partList} from "../../../api/api";
+import { getAction } from '@/api/manage'
+import '@/assets/less/TableExpand.less'
+
+export default {
+  name: 'PartBomList',
+  components: {},
+  mixins: [JeecgListMixin],
+  data() {
+    return {
+      visible: false,
+      confirmLoading: false,
+      selectIndex: null,
+      queryParam: {},
+      description: '项目C表信息',
+      loading2:false,
+      scrollXWidth: 1800,
+      headerId:'',
+      // 表头
+      url: {
+        list:'1',
+        childList: "/working/working/childList",
+      },
+      // 展开的行，受控属性
+      expandedRowKeys: [],
+      dataSource: [],
+      bomSource: [],
+      pnoArray:[],
+      scolor:'',
+      pno:'',
+      pbom_status:'',
+      projectName:'',
+      /* 分页参数 */
+      ipagination:{
+        current: 1,
+        pageSize: 5,
+        pageSizeOptions: ['5', '10', '50'],
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条"
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0
+      },
+      hasChildrenField:"hasChild",
+      pidField:"pno",
+      workNo:'',
+      field0057:'',
+      projectNo:'',
+      pno_arr:'',
+      uuid:'',
+      dictOptions:{
+      },
+      subExpandedKeys:[],
+      planColumns: [
+        {
+          title: '部件名称',
+          dataIndex: 'partName',
+          width: 100,
+          key: 'partName'
+        },
+        {
+          title: '部件编码',
+          dataIndex: 'cno',
+          width: 130,
+          key: 'cno'
+        },
+        {
+          title: '报工人数',
+          dataIndex: 'nums',
+          align: 'center',
+          width: 100,
+          key: 'nums'
+        }, {
+          title: '合格数量',
+          dataIndex: 'qty',
+          key: 'qty',
+          align: 'center',
+          width: 80
+        },
+        {
+          title: '总工时(小时)',
+          align: 'center',
+          dataIndex: 'hours',
+          scopedSlots:{
+            customRender:'departWorking'
+          }
+        },
+        {
+          title: '总工时(分钟)',
+          align: 'center',
+          dataIndex: 'time',
+          scopedSlots:{
+            customRender:'processWorking'
+          }
+        },
+        {
+          title: '重量(kg)',
+          align: 'center',
+          dataIndex: 'weight',
+          key: 'weight'
+        }
+      ],
+    }
+  },
+  created() {
+    this.getOutSourceStatus()
+    this.getdata()
+  },
+  computed:{
+    tableProps() {
+      let _this = this
+      return {
+        // 列表项是否可选择
+        rowSelection: {
+          selectedRowKeys: _this.selectedRowKeys,
+          onChange: (selectedRowKeys) => _this.selectedRowKeys = selectedRowKeys
+        }
+      }
+    },
+  },
+  methods: {
+    edit (record) {
+      this.projectName=record.projectName
+      this.visible = true;
+      this.onSelectChangeByBoom(record)
+    },
+    handleCancel () {
+      this.visible = false;
+    },
+    handleOk () {
+      this.visible = false;
+    },
+    getdata(){
+      let currColumns = this.planColumns
+      // res.result.columns表示接口获取的columns值，具体根据接口返回值修改
+      for(let a=0;a<currColumns.length;a++){
+        // 设置除最后一列的宽度，需要空一列自适应
+        if(a < currColumns.length-1) {
+          currColumns[a].width = 150;
+        }
+      }
+      console.log("-------------------",currColumns)
+      // 横向滚动长度大于所有宽度，才能实现固定表头
+      this.scrollXWidth = (currColumns.length) * 150 + 180;
+      this.planColumns = [...currColumns]
+    },
+    searchQuery() {
+      this.loadData(1);
+      this.bomSource=[];
+    },
+
+    rowClassName(record, index) {
+      return index === this.selectIndex ? 'Rowactive' : ''
+    },
+
+
+
+    onSelectChangeByBoom(data) {
+      this.headerId=data.headerId
+      this.loading2 = true
+      let params = {
+        'headerId':data.headerId,
+        'id':data.id,
+        'projectName': data.projectName,
+        'partName': data.partName,
+        'nums': data.nums,
+        'time': data.time,
+        'qty': data.qty,
+        'status1': data.status1,
+        'status2': data.status2,
+        'status3': data.status3,
+        'hours': data.hours,
+        'partNo': data.partNo,
+        'progress': data.progress,
+      }
+      partList(params).then((res) => {
+        if (res.code==0) {
+          this.loading2 = false
+          this.bomSource=this.getDataByResult(res.result.records);
+        }else{
+          this.loading2 = false
+          this.bomSource=[];
+          this.$message.error(res.message)
+        }
+      })
+    },
+
+    timeFormat(val) {
+      return moment(val).format('YYYY-MM-DD')
+    },
+    handleExpandedRowsChange(expandedRows) {
+      this.expandedRowKeys = expandedRows
+    },
+    handleBomChange(value) {
+      this.initBomTree(value)
+    },
+    onSelectAll(selected) {
+      if (selected) {
+        const tabData = this.bomSource;
+        const arr = [];
+        setVal(tabData, arr);
+        this.selectedRowKeys = arr;
+      } else {
+        this.selectedRowKeys = [];
+      }
+      function setVal(list, arr) {
+        list.forEach(v => {
+          arr.push(v.key);
+          if (v.children) {
+            setVal(v.children, arr);
+          }
+        });
+      }
+    },
+    numFormat(qty){
+      if(qty==undefined){
+        return '';
+      }else{
+        return  parseFloat(qty).toFixed(1);
+      }
+    },
+    onSelect(record, selected) {
+      const set = new Set(this.selectedRowKeys);
+      const tabData = this.bomSource;
+      const key = record.key;
+      if (selected) {
+        set.add(key);
+        record.children && setChildCheck(record.children);
+        // setParentCheck(key);
+      } else {
+        set.delete(key);
+        record.children && setChildUncheck(record.children);
+        setParentUncheck(key);
+      }
+
+      this.selectedRowKeys = Array.from(set);
+      // 设置父级选择
+      function setParentCheck(key) {
+        let parent = getParent(key);
+        if (parent) {
+          set.add(parent.key);
+          setParentCheck(parent.key);
+        }
+      }
+      // 设置父级取消，如果父级的子集有选择，则不取消
+      function setParentUncheck(key) {
+        let childHasCheck = false,
+          parent = getParent(key);
+        if (parent) {
+          let childlist = parent.children;
+          childlist.forEach(function(v) {
+            if (set.has(v.key)) {
+              childHasCheck = true;
+            }
+          });
+          if (!childHasCheck) {
+            set.delete(parent.key);
+            setParentUncheck(parent.key);
+          }
+        }
+      }
+      // 获取当前对象的父级
+      function getParent(key) {
+        for (let i = 0; i < tabData.length; i++) {
+          if (tabData[i].key === key) {
+            return null;
+          }
+        }
+        return _getParent(tabData);
+        function _getParent(list) {
+          let childlist,
+            isExist = false;
+          for (let i = 0; i < list.length; i++) {
+            if ((childlist = list[i].children)) {
+              childlist.forEach(function(v) {
+                if (v.key === key) {
+                  isExist = true;
+                }
+              });
+              if (isExist) {
+                return list[i];
+              }
+              if (_getParent(childlist)) {
+                return _getParent(childlist);
+              }
+            }
+          }
+        }
+      }
+      // 设置child全选
+      function setChildCheck(list) {
+        list.forEach(function(v) {
+          set.add(v.key);
+          v.children && setChildCheck(v.children);
+        });
+      }
+      // 设置child取消
+      function setChildUncheck(list) {
+        list.forEach(function(v) {
+          set.delete(v.key);
+          v.children && setChildUncheck(v.children);
+        });
+      }
+    },
+
+    confirmHandle(record) {
+      var llqty=record.llqty;
+      if (llqty==undefined){
+        llqty='0';
+      }
+      var qty=record.qty;
+      if (qty==undefined){
+        qty='0';
+      }
+      var bnum=record.bnum;
+      if (bnum==undefined){
+        bnum='0';
+      }
+      var xnqty=parseInt(bnum)-parseInt(llqty)
+      var status='';
+      if (parseInt(llqty) >= parseInt(bnum)) {
+        status= '2';
+      } else {
+        if (parseInt(xnqty) <= parseInt(qty)) {
+          status= '1';
+        } else {
+          status= '0';
+        }
+      }
+      if(record.qty==undefined){
+        status='';
+      }
+      var actions = []
+      Object.keys(this.outsourcingInStatusList).some((key) => {
+        if (this.outsourcingInStatusList[key].value == ('' + status)) {
+          actions.push(this.outsourcingInStatusList[key].text)
+          return true
+        }
+      })
+      return actions.join('')
+    },
+
+    solutionColor(record) {
+      var llqty=record.llqty;
+      if (llqty==undefined){
+        llqty='0';
+      }
+      var qty=record.qty;
+      if (qty==undefined){
+        qty='0';
+      }
+      var bnum=record.bnum;
+      if (bnum==undefined){
+        bnum='0';
+      }
+      var xnqty=parseInt(bnum)-parseInt(llqty)
+      var status='';
+      if (parseInt(llqty) >= parseInt(bnum)) {
+        status= '2';
+      } else {
+        if (parseInt(xnqty) <= parseInt(qty)) {
+          status= '1';
+        } else {
+          status= '0';
+        }
+      }
+      var actions = ''
+      Object.keys(this.outsourcingInStatusList).some((key) => {
+        if (this.outsourcingInStatusList[key].value == ('' + status)) {
+          actions = this.outsourcingInStatusList[key].color
+        }
+      })
+      return actions
+    },
+
+    getOutSourceStatus() {
+      ajaxGetDictItems('bom_inv_status').then((res) => {
+        if (res.success) {
+          this.outsourcingInStatusList = res.result
+        }
+      })
+    },
+
+
+    getDataByResult(result){
+      return result.map(item=>{
+        //判断是否标记了带有子节点
+        if(item[this.hasChildrenField]=='1'){
+          let loadChild = { cno: item.cno+'_loadChild', name: 'loading...', isLoading: true }
+          item.children = [loadChild]
+        }
+        return item
+      })
+    },
+
+    handleExpand(expanded, record){
+      // 判断是否是展开状态id
+      if (expanded) {
+        this.expandedRowKeys.push(record.id)
+        debugger
+        if (record.children.length>0 && record.children[0].isLoading === true) {
+         // let params = this.getQueryParams();//查询条件
+          let params = {
+            "headerId":this.headerId,
+            "partNo":record.partNo,
+            "cno":record.cno,
+            "pno":record.cno
+          };//查询条件
+          // params[this.pidField] = record.cno
+          // params['headerId'] = record.headerId
+          // params['partNo'] = record.partNo
+          // params['cno'] = record.cno
+          // params['cno'] = record.cno
+          getAction(this.url.childList,params).then((res)=>{
+            if(res.success){
+              if(res.result && res.result.length>0){
+                record.children = this.getDataByResult(res.result)
+                this.bomSource = [...this.bomSource]
+              }else{
+                record.children=''
+                record.hasChildrenField='0'
+              }
+            }else{
+              this.$message.warning(res.message)
+            }
+          })
+
+        }
+
+      }else{
+        let keyIndex = this.expandedRowKeys.indexOf(record.id)
+        if(keyIndex>=0){
+          this.expandedRowKeys.splice(keyIndex, 1);
+        }
+      }
+    },
+
+    // 添加子分类时获取所有父级id
+    getExpandKeysByPid(pid,arr,all){
+      if(pid && arr && arr.length>0){
+        for(let i=0;i<arr.length;i++){
+          if(arr[i].cno==pid){
+            this.subExpandedKeys.push(arr[i].cno)
+            this.getExpandKeysByPid(arr[i]['pid'],all,all)
+          }else{
+            this.getExpandKeysByPid(pid,arr[i].children,all)
+          }
+        }
+      }
+    },
+    getFormDataById(cno,arr){
+      if(arr && arr.length>0){
+        for(let i=0;i<arr.length;i++){
+          if(arr[i].cno==cno){
+            this.parentFormData = arr[i]
+          }else{
+            this.getFormDataById(cno,arr[i].children)
+          }
+        }
+      }
+    },
+    expandTreeNode(nodeId){
+      return new Promise((resolve,reject)=>{
+        this.getFormDataById(nodeId,this.bomSource)
+        let row = this.parentFormData
+        this.expandedRowKeys.push(nodeId)
+        let params = this.getQueryParams();//查询条件
+        params[this.pidField] = nodeId
+        getAction(this.url.childList,params).then((res)=>{
+          if(res.success){
+            if(res.result && res.result.length>0){
+              row.children = this.getDataByResult(res.result)
+              this.bomSource = [...this.bomSource]
+              resolve()
+            }else{
+              row.children=''
+              row.hasChildrenField='0'
+              reject()
+            }
+          }else{
+            reject()
+          }
+        })
+      })
+    },
+
+    // 根据已展开的行查询数据（用于保存后刷新时异步加载子级的数据）
+    loadDataByExpandedRows(dataList) {
+      if (this.expandedRowKeys.length > 0) {
+        return getAction(this.url.getChildListBatch,{ parentIds: this.expandedRowKeys.join(',') }).then(res=>{
+          if (res.success && res.result.records.length>0) {
+            //已展开的数据批量子节点
+            let records = res.result.records
+            const listMap = new Map();
+            for (let item of records) {
+              let pid = item[this.pidField];
+              if (this.expandedRowKeys.join(',').includes(pid)) {
+                let mapList = listMap.get(pid);
+                if (mapList == null) {
+                  mapList = [];
+                }
+                mapList.push(item);
+                listMap.set(pid, mapList);
+              }
+            }
+            let childrenMap = listMap;
+            let fn = (list) => {
+              if(list) {
+                list.forEach(data => {
+                  if (this.expandedRowKeys.includes(data.cno)) {
+                    data.children = this.getDataByResult(childrenMap.get(data.cno))
+                    fn(data.children)
+                  }
+                })
+              }
+            }
+            fn(dataList)
+          }
+        })
+      } else {
+        return Promise.resolve()
+      }
+    },
+
+    selectChanges(selectedRowKeys, selectionRows) {
+      this.selectedRowKeys = selectedRowKeys;
+      this.selectionRows = selectionRows;
+      var array='';
+      var uid='';
+      this.selectionRows.forEach(function (row) {
+        array += row.cno + ",";
+      });
+      this.pno_arr=array
+    },
+
+
+    /** 点击a-table中的行后，展开或关闭其子行 */
+    tableClick(record, index){
+      return {
+        style:{
+          cursor:'pointer',
+        },
+        on: {
+          click: () => {
+            this.expandRowByClick = !this.expandRowByClick;
+          }
+        }
+      }
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
 \ No newline at end of file