Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2023-12-29 b3cdb967634dddba8a88bca2550f7e07c9ac262c

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 src/views/plan/manufacturingorder/productorder-form.vue

@@ -692,13 +692,13 @@
                      label="单位"
                    />

                    <el-table-column
                    <!-- <el-table-column
                      prop="discNum"
                      width="150"
                      header-align="center"
                      align="center"
                      label="盘数(盘)"
                    />
                    /> -->

                    <!-- <el-table-column
                      prop="version"

 src/views/plan/productionschedul/index.vue

@@ -2,74 +2,79 @@
  <div class="mod-config">
    <basic-container>
      <el-row>
        <el-col :span="14" style="height:100vh">
          <el-row style="height:50%;padding:0px 10px;">
            <el-col :span="24">
              <div>
                <span style="position: relative;top:40px;color:#E84738">未完成</span>
                <span style="position: relative;top:30px;left:61%;z-index: 11">
        <el-col :span="16" style="height:100vh">
          <el-row style="height:65%;padding:0px 10px;">
            <el-col :span="24" style="margin: 0;">
              <div style="display:flex;height:36px;justify-content: space-between;align-items:center;">
                <div><span style="color:#E84738;font-weight: bold;">未完成</span></div>
                <div>
                  <el-button @click="tagFinished" size="mini" round type="success">标记已完成</el-button>
                  <el-button size="mini" round type="primary"
                  v-if="permissions.plan_productionschedul_edit_line" 
                  @click="openEditDialog">编辑时间线</el-button>
                </span>
                <avue-crud 
                :data="tableData" 
                ref="crud" 
                :option="option" 
                :span-method="spanMethod" 
                @refresh-change="getDataList"
                @current-change="handleCurrentChange"
                @size-change="handleSizeChange"
                :page="page" 
                @selection-change="selectionRow"
                :table-loading="loading">
                <template #menu="{ row, index }">
                  <el-button 
                  v-if="permissions.plan_productionschedul_edit" 
                  type="text" 
                  icon="el-icon-edit" 
                  size="small" 
                  @click="editHandle(row, index)">编辑</el-button>
                  <el-button 
                  v-if="permissions.plan_productionschedul_del" 
                  type="text" 
                  icon="el-icon-delete" 
                  size="small" 
                  @click="deleteHandle(row, index)">删除</el-button>
                </template>
                </avue-crud>
                  <el-tooltip content="刷新">
                    <el-button circle icon="el-icon-refresh" @click="getDataList"></el-button>
                  </el-tooltip>
                </div>
              </div>
              <avue-crud 
              class="unfinished-crud"
              :data="tableData" 
              ref="crud" 
              :option="option" 
              :span-method="spanMethod" 
              @refresh-change="getDataList"
              @current-change="handleCurrentChange"
              @size-change="handleSizeChange"
              :page="page" 
              @selection-change="selectionRow"
              :table-loading="loading">
              <template #menu="{ row, index }">
                <el-button 
                v-if="permissions.plan_productionschedul_edit" 
                type="text" 
                icon="el-icon-edit" 
                size="small" 
                @click="editHandle(row, index)">编辑</el-button>
                <el-button 
                v-if="permissions.plan_productionschedul_del" 
                type="text" 
                icon="el-icon-delete" 
                size="small" 
                @click="deleteHandle(row, index)">删除</el-button>
              </template>
              </avue-crud>
            </el-col>
          </el-row>
          <el-row style="height:50%;padding:0px 10px;">
            <el-col :span="24">
              <div>
                <span style="position: relative;top:0px;color:#34BD66">已完成</span>
                <avue-crud 
                :data="finishedTableData" 
                ref="finished" 
                :option="finishedOption" 
                :span-method="spanMethod" 
                @refresh-change="getFinishedData"
                @current-change="handleCurrentChange"
                @size-change="handleSizeChange"
                :page="finishedPage" 
                @selection-change="selectionFinishedRow">
                <!-- <template #menu="{ row, index }">
                  <el-button 
                  v-if="permissions.plan_productionschedul_del" 
                  type="text" 
                  icon="el-icon-delete" 
                  size="small" 
                  @click="deleteHandle(row, index)">删除</el-button>
                </template> -->
                </avue-crud>
          <el-row style="height:35%;padding:0px 10px;">
            <el-col :span="24" style="margin: 0;">
              <div style="display:flex;height:36px;justify-content: space-between;align-items:center;">
                <div><span style="color:#34BD66;font-weight: bold;">已完成</span></div>
              </div>
              <avue-crud 
              class="finished-crud"
              :data="finishedTableData" 
              ref="finished" 
              :option="finishedOption" 
              :span-method="spanMethod" 
              @refresh-change="getFinishedData"
              @current-change="handleCurrentChange"
              @size-change="handleSizeChange"
              :page="finishedPage" 
              @selection-change="selectionFinishedRow">
              <!-- <template #menu="{ row, index }">
                <el-button 
                v-if="permissions.plan_productionschedul_del" 
                type="text" 
                icon="el-icon-delete" 
                size="small" 
                @click="deleteHandle(row, index)">删除</el-button>
              </template> -->
              </avue-crud>
            </el-col>
          </el-row>
        </el-col>
        <el-col :span="10" style="padding-left: 10px">
        <el-col :span="8" style="padding-left: 10px">
          <div style="">
            <el-card>
              <div slot="header" class="clearfix">
@@ -79,6 +84,8 @@
                <el-timeline>
                    <el-timeline-item
                      placement="top"
                      :color="(item.planTime||item.actualTime) ? '#34BD66' :null"
                      :icon="(item.planTime||item.actualTime) ? 'el-icon-circle-check' :null"
                      v-for="(item, index) in scheduleList"
                      :key="index"
                      :timestamp="item.title">
@@ -223,7 +230,7 @@
          prop:'id',
          order:'descending'
        },
        height: 230,
        height: 370,
        selection: true,
        columnBtn: false,
        index: true,
@@ -333,7 +340,7 @@
          prop:'id',
          order:'descending'
        },
        height: 250,
        height: 230,
        selection: true,
        columnBtn: false,
        index: true,
@@ -560,7 +567,6 @@
        if(res.data.data.length==1){
          let dataList = this.initTimeLine(res.data.data[0])
          this.scheduleEditList = dataList
          console.log(this.scheduleEditList);
          this.dialogVisible = true
        }else{
          this.$message.error("选中数据的调度时间线不一致!")
@@ -604,7 +610,7 @@
        this.getScheduleById(orderObj.id)
        this.dialogVisible = false
      }).catch(error=>{
        console.log(error);
        console.error(error);
      })

    },
@@ -655,23 +661,22 @@
        fetchScheduleById(id).then(res=>{
          this.scheduleList = this.initTimeLine(res.data.data)
        }).catch(error=>{
          console.log(error);
          console.error(error);
        })
      }
    },
    selectionRow(val){
      // if (val.length > 1) {
      //   const preVal = val.shift();
      //   this.$refs.crud.toggleRowSelection(preVal, false);
      // }
      // else{
      //   this.scheduleList=[]
      // }
      if (val.length > 1) {
        const preVal = val.shift();
        this.$refs.crud.toggleRowSelection(preVal, false);
      }
      else{
        this.scheduleList=[]
      }
      this.multipleSelection = val
      // this.getScheduleById(val[0].id)
      this.getScheduleById(val[0].mid)
    },
    selectionFinishedRow(val){
      console.log(val);
      if (val.length > 1) {
        const preVal = val.shift();
        this.$refs.finished.toggleRowSelection(preVal, false);
@@ -823,51 +828,22 @@
}
</script>
<style>
.avue-crud__tip{
.unfinished-crud .avue-crud__tip{
  display: none;
}
.unfinished-crud .avue-crud__menu{
  display: none;
}
.finished-crud .avue-crud__tip{
  display: none;
}
.finished-crud .avue-crud__menu{
  display: none;
}
.avue-crud__pagination {
    position: relative;
    padding: 5px 0 20px 20px;
    padding: 0px 0 0px 20px;
    text-align: right;
    z-index: 10;
}
.basic-template-table .el-table__body .el-table__row td:first-child .cell {
  padding-left: 0px;
  padding-right: 0px;
}

.basic-template-table .el-table__body .el-table__row:hover {
  cursor: move;
}

.basic-template-table .el-table__body .el-table__row:hover .icon {
  display: inline-block;
}

.basic-template-table .el-table__body .el-table__row .icon {
  color: rgba(0, 0, 0, 0.45);
  font-size: 12px;
  line-height: 18px;
  display: none;
}

.aufontAll {
  font-family: aufontAll !important;
  font-size: 14px;
  font-style: normal;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
}

.h-icon-all-drag {
  background: url('/img/tz.png') center center no-repeat;
  background-size: cover;
  font-size: 14px;
}
.h-icon-all-drag:before {
  content: '\E63E';
  font-size: 14px;
  visibility: hidden;
}
</style>

 src/views/product/workbench/workReportCard.vue

@@ -44,10 +44,10 @@
            @click="addShiftProductOut()"
            >交班产出
          </el-button> -->
          <el-button class="batch-out-btn" type="primary"
          <!-- <el-button class="batch-out-btn" type="primary"
            :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow"
            @click="addBatchProductOut()">汇报产出
          </el-button>
          </el-button> -->
          <!-- <div class="print-button-class">
            <el-button type="danger" class="print-btn" @click="batchPrint()"
              >大标签打印
@@ -114,9 +114,9 @@
              @change="labelTabChange4"
            ></el-checkbox>
          </div> -->
          <el-button class="change-shift-out-btn" type="primary"
          <!-- <el-button class="change-shift-out-btn" type="primary"
            :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="editList()">编辑
          </el-button>
          </el-button> -->
          <el-button class="batch-out-del-btn" type="primary"
            :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="editShow" @click="cancelSaveList()">取消
          </el-button>
@@ -126,10 +126,10 @@
          <!-- <el-button class="tracking-out-revoke-btn" type="primary" icon="tracking-btn-out"
          :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" >交班
        </el-button> -->
        <el-button class="submit-out-btn" type="primary"
        <!-- <el-button class="submit-out-btn" type="primary"
            :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="submitList()"
            :loading="submitLoading">提交
          </el-button>
          </el-button> -->
          <el-button class="batch-out-del-btn" type="primary"
            :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="deleteList()">删除
          </el-button>

 src/views/quality/finishedProductInspection/finishedProduct-form.vue

@@ -298,7 +298,7 @@
                mcode: null,
                prname: null,
                sname: null,
                orderNumber: "ZTTIC20230001",
                orderNumber: null,
                qualityTraceability: null,
                quantity: null,
                specificationsModel: null,
@@ -337,7 +337,6 @@
        this.deviceCode = false
      },
      getDeviceResultInfo(val){
        console.log("扫描后数据",val);
        let id=val.split("id@")[1]
        if(id!=undefined&&id!=''&&id!=null){
            let filterData=this.deviceList.filter(item=>{
@@ -348,7 +347,7 @@
        this.updateDevice(this.row)
        }else{
        this.$message({
          message: '未识别出二位码计量器具信息！',
          message: '未识别出计量器具信息！',
          type: 'warning'
        });
        }
@@ -486,14 +485,30 @@
                        }
                    })
                    this.inspectionItems = result.children
                    let rVal = ''
                    let passNum = 0
                    let unPassNum = 0
                    this.inspectionItems.forEach(item => {
                        if (item.children) {
                            item.children.forEach(obj => {
                                if(obj.iresult == 0){
                                    unPassNum += 1
                                }
                                if(obj.iresult == 1){
                                    passNum+=1
                                }
                            })
                        }
                    })
                    rVal = (passNum+unPassNum)>0 ? unPassNum>0 ? '0' :'1' : ''
                    this.inspectionResultForm = [{
                        materialCode: result.materialCode,
                        material: result.material,
                        userName: Array.from(new Set(userList)).join(","),
                        result: this.resultVal==null ? '' : this.resultVal,
                        result: this.resultVal==null ? rVal : this.resultVal,
                    }]
                }).catch(error=>{
                    console.log(error)
                    console.error(error)
                })
            }
        },

 src/views/quality/packageinspect/packageInspect-form.vue

@@ -253,18 +253,23 @@
      changeResult(){
        let result = ''
        let data = this.list
        let passNum = 0
        let unPassNum = 0
        if(data){
          result='合格'
          data.forEach(item=>{
            if(item.children){
              item.children.forEach(ele=>{
                if(ele.result=='不合格'){
                  result='不合格'
                  unPassNum+=1
                }
                if(ele.result=='合格'){
                  passNum+=1
                }
              })
            }
          })
        }
        result = (passNum+unPassNum)>0 ? unPassNum>0 ? '不合格' :'合格' : ''
        this.conclusionTable[0].result = result
      },
      //上报

 src/views/quality/processInspect/processInspect-form.vue

@@ -486,16 +486,22 @@
                        }
                    })
                    this.inspectionItems = result.children
                    let rVal = '1'
                    let rVal = ''
                    let passNum = 0
                    let unPassNum = 0
                    this.inspectionItems.forEach(item => {
                        if (item.children) {
                            item.children.forEach(obj => {
                                if (obj.iresult == 0) {
                                    rVal = '0'
                                if(obj.iresult == 0){
                                    unPassNum += 1
                                }
                                if(obj.iresult == 1){
                                    passNum+=1
                                }
                            })
                        }
                    })
                    rVal = (passNum+unPassNum)>0 ? unPassNum>0 ? '0' :'1' : ''
                    this.inspectionResultForm = [{
                        materialCode: result.materialCode,
                        material: result.material,

 src/views/quality/rawMaterial/rawMaterial-form.vue

@@ -114,7 +114,7 @@
      <div>
        <el-tabs class="rawMaterial-detail" @tab-click="tabsClick">
          <el-tab-pane label="检验项目">
            <el-row style="width:100%;z-index: 10;height:50px;">
            <el-row style="width:100%;z-index: 10;height:50px;" v-if="resultVal==null">
                <el-col :sm="15" :lg="18"></el-col>
                <el-col :sm="3" :lg="2" style="text-align: right;">
                  <el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">添加检验项目</el-button>
@@ -241,7 +241,7 @@
              element-loading-text="请稍等，文件上传中"
            >
              <el-upload
                :disabled="dataForm.rawInsNo==null"
                :disabled="dataForm.rawInsNo==null || resultVal!=null"
                drag
                ref="upload"
                action="/mes/rawInsProduct/upload"
@@ -828,16 +828,22 @@
                    this.list.push(ele)
                }}
            })
            let rVal = '1'
            let rVal = ''
            let passNum = 0
            let unPassNum = 0
            this.list.forEach(item=>{
                if(item.children){
                  item.children.forEach(ele=>{
                    if(ele.testState == 0){
                      rVal = '0'
                      unPassNum += 1
                    }
                    if(ele.testState == 1){
                      passNum+=1
                    }
                  })
                }
            })
            rVal = (passNum+unPassNum)>0 ? unPassNum>0 ? '0' :'1' : ''
            this.conclusionTable = [{
              code: data.code,
              name: data.name,
@@ -974,7 +980,7 @@

.rawMaterial-basic {
  background-color: #fff;
  height: 155px;
  height: 170px;
  display: flex;
  flex-wrap: wrap;
  padding: 10px 20px;

 src/views/warehouse/pallettransports/index.vue

@@ -432,7 +432,6 @@
    palletTransportsMaterialSelectionChange() {
      if(this.cid){
        selectAll({transportsId:this.cid}).then((res)=>{
          console.log(res.data.data);
              this.palletTransportsDetailData = res.data.data.map(el =>{
                return{
                  part_no:el.partNo,
@@ -700,7 +699,6 @@
    // 获取移库明细数据列表
    getPalletTransportsDetailData() {
      let transportsDetails =[]
      console.log(this.palletTransportsMaterialMultipleSelection,"----+");
      transportsDetails = this.palletTransportsMaterialMultipleSelection.map(el =>{
        return{
          partNo:el.partNo,
@@ -803,14 +801,10 @@
    },
    //改变
    moveLocation(val){
      console.log(val,"---->");
      let num = Number(val.transfer_quantity)
      this.palletTransportsDetailMultipleSelection.forEach(el =>{
                        console.log(el.transfer_quantity);
                        el.transfer_quantity = num
          el.transfer_quantity = num
      })
      console.log(this.palletTransportsDetailMultipleSelection,"--->123");
     
    },
    updateStockFun(){
      let data = []
@@ -875,7 +869,6 @@
      this.showDetailStock = true
    },
    palletTransportsDetailSelectionChange(val) {
      console.log(val,"-=-=-=");
      this.palletTransportsDetailMultipleSelection = val
    },
    getOptasks() {