更新

src/views/Inventory/CreatePickingList/index.vue

@@ -267,7 +267,7 @@
           <el-button size="small" type="primary" plain icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
           <el-button size="small" type="distribution" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="createList()">创建领料单</el-button>
           <el-tooltip :open-delay="1200" effect="dark" content="为所选领料单增加物料明细" placement="top">
-            <el-button :disabled="selectInto_disable" size="small" type="success" plain icon="el-icon-bottom" style="margin: 0 0 5px 10px" @click="selectInto()">选入物料</el-button>
+            <el-button :disabled="selectInto_disable || Number(审批情况)===1" size="small" type="success" plain icon="el-icon-bottom" style="margin: 0 0 5px 10px" @click="selectInto()">选入物料</el-button>
           </el-tooltip>
           <el-button :disabled="Number(审批情况)===1" size="small" plain type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropList()">删除领料单</el-button>
           <el-button :disabled="Number(审批情况)===1" size="small" plain type="danger" icon="el-icon-right" style="margin-right: 20px;float: right" @click="dropListDetail()">移除领料明细</el-button>

src/views/Inventory/MaterialOut/index.vue

@@ -54,7 +54,6 @@
     <div style="width: 62%;float: left">
       <el-card>
         <el-table :data="pickListTable2" :row-class-name="tableRowClassName1" highlight-current-row border style="width: 1000px" size="mini" height="600" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" align="center" width="45"/>
           <el-table-column label="名称" show-overflow-tooltip prop="名称" align="center" width="90">
             <template slot-scope="scope">
               {{ scope.row.名称 }}
@@ -579,6 +578,9 @@ export default {
           if (res.data[i].货位存量1 > res.data[i].总数量) {
             res.data[i].出库数量 = res.data[i].总数量
           }
+          if (res.data[i].出库数量1 >= res.data[i].总数量) {
+            res.data[i].出库数量 = 0
+          }
         }
         this.pickListTable2 = res.data
       })
@@ -609,7 +611,17 @@ export default {
     // 提交领料确认
     pickConfirm1() {
       this.buttonDisable = true
+      this.multipleSelection = []
+      this.basePartNum = []
+      this.materialNum = []
+      this.parchasePartNum = []
+      this.purchaseBillNum = []
+      this.groupNumValue = []
+      this.machineValue = []
+      this.offlineNum = []
+      this.outNumber = []
       for (let i = 0; i < this.pickListTable2.length; i++) {
+        console.log(this.pickListTable2[i].出库数量, 1233)
         if (this.pickListTable2[i].出库数量 !== 0) {
           this.multipleSelection.push(this.pickListTable2[i].领料单明细流水号)
           this.basePartNum.push(this.pickListTable2[i].基本件流水号)

src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue

@@ -75,6 +75,11 @@
             {{ scope.row.完成工时 }}
           </template>
         </el-table-column>
+        <el-table-column label="完成工时(分)" align="center" prop="完成工时" width="110">
+          <template slot-scope="scope">
+            {{ Number(scope.row.完成工时) + Number(scope.row.修补工时) }}
+          </template>
+        </el-table-column>
         <el-table-column label="准结(分)" align="center" prop="修补工时" width="110">
           <template slot-scope="scope">
             {{ scope.row.修补工时 }}

src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue

@@ -62,11 +62,16 @@
             {{ scope.row.修补单件工时 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="完成工时(分)" width="110px">
+        <el-table-column align="center" label="加工工时(分)" width="110px">
           <template slot-scope="scope">
             {{ scope.row.完成工时 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="完成工时(分)" width="110px">
+          <template slot-scope="scope">
+            {{ Number(scope.row.完成工时) + Number(scope.row.修补工时) }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="准结(分)" width="110px">
           <template slot-scope="scope">
             {{ scope.row.修补工时 }}

src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue

@@ -62,7 +62,7 @@
             {{ scope.row.修补单件工时 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="完成工时(分)" width="110px">
+        <el-table-column align="center" label="加工工时(分)" width="110px">
           <template slot-scope="scope">
             {{ scope.row.完成工时 }}
           </template>

src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue

@@ -292,9 +292,9 @@ export default {
     },
     timeChange() {
       if (this.form1.完成数量 > 0) {
-        this.加工时间 = Number(this.form1.录入工时) * Number(this.form1.完成数量) + Number(this.form1.录入准结)
+        this.加工时间 = Number(this.form1.录入工时) * Number(this.form1.完成数量)
       } else {
-        this.加工时间 = Number(this.form1.录入工时) + Number(this.form1.录入准结)
+        this.加工时间 = Number(this.form1.录入工时)
       }
     },
     submit1() {

src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue

@@ -0,0 +1,325 @@
+<template>
+  <div>
+    <div style="width: 1900px;overflow:auto">
+      <div style="white-space: nowrap">
+        <el-card>
+          <el-row>
+            <el-select v-model="machineNameValue" placeholder="机床图号" style="width: 150px" size="small" filterable clearable>
+              <el-option
+                v-for="item in machineName"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+            <el-input v-model="partName" placeholder="零件图号名称" size="small" clearable style="width:150px"/>
+            <el-date-picker
+              v-model="outTime"
+              type="daterange"
+              size="small"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              range-separator="~"
+              style="width:240px;margin-left: 10px"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+            <!--<span>处理结果:</span>-->
+            <el-select v-model="ProcessingResultValue" filterable placeholder="处理结果" size="small" style="width: 130px;margin-left: 10px" clearable>
+              <el-option
+                v-for="item in ProcessingResult"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+            <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;searchTable()">查询</el-button>
+            <!--<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;loginsession()">session</el-button>-->
+            <el-button type="distribution" icon="el-icon-top" size="small" plain style="margin-left: 10px" @click="submit()">提交补投</el-button>
+          </el-row>
+        </el-card>
+      </div>
+    </div>
+    <el-card>
+      <el-table
+        v-loading="loading"
+        ref="multipleTable"
+        :data="tableData"
+        :row-class-name="tableRowClassName"
+        height="590"
+        style="width: 1390px; margin: 3px 0"
+        size="mini"
+        border
+        highlight-current-row
+        element-loading-text="拼命加载中"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" align="center" width="45"/>
+        <el-table-column label="机床图号" prop="机床图号" align="center" width="140px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床名称" prop="机床名称" align="center" width="140px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.机床名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="组号" prop="组号" align="center" width="100px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.组号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件图号" prop="零件图号" align="center" width="173px" show-overflow-tooltip>
+          <!--<el-table-column label="零件图号" prop="零件图号" align="center" width="180" show-overflow-tooltip>-->
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件名称" align="center" width="129" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.零件名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="工序名称" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.工艺名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="加工数" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.批次数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="质检数量" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="不合格数" align="center" width="90px">
+          <template slot-scope="scope">
+            {{ scope.row.不合格数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="不合格原因" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.不合格原因文本 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="处理结果" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.不合格处理文本 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="责任人" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.不合格处理文本 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="报废工时(分)" align="center" width="110">
+          <template slot-scope="scope">
+            {{ scope.row.报废工时 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="提交补投" align="center" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.报废时间 ? scope.row.报废时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="补投时间" align="center" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.补投时间 ? scope.row.补投时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="质检备注" align="center" width="120px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.备注 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="质检人员" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="质检时间" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 40, 100]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { searchMachine, searchProcessingResult, searchtable, editSpare } from '@/api/ManufacturingCenter/ScrappedSupplementaryInvestment'
+import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      machineNameValue: '', // 机床图号
+      machineName: [],
+      partName: '',
+      all: false,
+      loading: false,
+      handleEdit_disable: false,
+      ProcessingResultValue: '',
+      ProcessingResult: [],
+      procedureGroup: [],
+      ScrapQuantity: [],
+      ProcessPlanNumber: [],
+      Data: [],
+      tableData: [], // 表格数据
+      total: 0, // 总条数
+      pageSize: 30, // 每页显示条数
+      pageCurrent: 1, // 后台获取页
+      outTime: '',
+      order: ''
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'id',
+      'token'
+    ])
+  },
+  created() {
+    this.projectChange()
+  },
+  methods: {
+    projectChange() {
+      this.machineName = []
+      this.machineNameValue = ''
+      searchMachine().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machineName.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
+      searchProcessingResult().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.ProcessingResult.push({
+            label: response.data[i].不合格处理文本,
+            value: response.data[i].不合格处理
+          })
+        }
+      })
+    },
+    machineChange() {
+      this.searchTable()
+    },
+    exportTable() {
+      let check7, check8
+      if (this.partName !== '' && this.partName !== null) {
+        this.partNamecheck = true
+      } else {
+        this.partNamecheck = false
+      }
+      this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '')
+      this.all === false ? check8 = 0 : check8 = 1
+      var param = []
+      param[0] = ['机床流水号', this.machineNameValue]
+      param[1] = ['零件图号_check', this.partNamecheck]
+      param[2] = ['零件图号', this.partName]
+      param[3] = ['投产时间_check', check7]
+      if (check7 === 0) {
+        param[4] = ['开始时间', '']
+        param[5] = ['结束时间', '']
+      } else {
+        param[4] = ['开始时间', this.outTime[0]]
+        param[5] = ['结束时间', this.outTime[1]]
+      }
+      param[6] = ['加急_check', check8]
+      var Data = this.CreateData('2001', '报表_生产计划查询', param)
+      this.exportExcel_NPOI(Data)
+    },
+    // 查询表格数据
+    searchTable() {
+      if (this.machineNameValue || this.partName || this.outTime) {
+        this.loading = true
+        let check, check1
+        this.machineNameValue ? check = 1 : check = 0
+        this.partName ? check1 = 1 : check1 = 0
+        let check7, check10
+        this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '')
+        this.ProcessingResultValue ? check10 = 1 : check10 = 0
+        searchtable(check, this.machineNameValue, check1, this.partName, check7, this.outTime[0], this.outTime[1], check10, this.ProcessingResultValue, this.pageCurrent, this.pageSize).then(response => {
+          console.log(response.data, 123)
+          this.tableData = response.data.result
+          this.loading = false
+          this.total = parseInt(response.data.output[0].ItemCount)
+          this.loading = false
+        })
+      } else {
+        this.$message.warning('请输入筛选条件')
+      }
+    },
+    submit() {
+      this.$confirm('是否将零件提交报废?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.ScrapQuantity = []
+        this.ProcessPlanNumber = []
+        for (let i = 0; i < this.procedureGroup.length; i++) {
+          this.ScrapQuantity.push(this.procedureGroup[i].不合格数量)
+          this.ProcessPlanNumber.push(this.procedureGroup[i].工艺计划流水号)
+        }
+        this.handleEdit_disable = true
+        editSpare(this.ProcessPlanNumber, this.ScrapQuantity, this.id).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('报废成功')
+            this.searchTable()
+          } else {
+            this.handleEdit_disable = false
+            this.$message.success('报废失败')
+          }
+        })
+      }).catch((error) => {
+        console.log(error)
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    tableRowClassName({ row }) {
+      if (row.是否加急 === '1') {
+        return 'UrgentItem'
+      }
+    },
+    handleSelectionChange(val) {
+      this.procedureGroup = val
+      console.log(val, 123)
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchTable()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchTable()
+    }
+  }
+}
+
+</script>
+
+<style>
+  .el-table .UrgentItem{
+    background: #FF9797;
+  }
+</style>
+

src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue

@@ -470,12 +470,10 @@ export default {
       this.dateRange ? check1 = 1 : (check1 = 0, this.dateRange = '')
       this.supplierValue ? check2 = 1 : check2 = 0
       this.searchAll === false ? check3 = 1 : check3 = 0
-      searchRequestFund(this.pageCurrent1, this.pageSize1, check1, this.dateRange[0], this.dateRange[1], check2, this.supplierValue, check3, this.id).then(response => {
+      searchRequestFund(this.pageCurrent1, this.pageSize1, check1, this.dateRange[0], this.dateRange[1], check2, this.supplierValue, check3).then(response => {
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })
-      this.tableData2 = []
-      this.gridData = []
       this.totalSum = 0
       this.totalPay = 0
       searchPurchaseContract(1, check2, this.supplierValue).then(response => {

src/views/WorkshopProcurement/OfflineProcurement/index.vue

@@ -522,7 +522,7 @@ export default {
         if (valid) {
           this.addPurchaseOrder_disable = true
           this.supplierName = this.form2.supplierNameValue
-          addPurchaseOrder(this.form2.计划名称, this.form2.supplierNameValue).then(response => {
+          addPurchaseOrder(this.form2.计划名称, this.form2.supplierNameValue, this.id).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('新建离线外购备料成功')
               this.searchTable()

src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue

@@ -96,6 +96,11 @@
           width="100">
           <template slot-scope="scope">{{ scope.row.到货数量 }}</template>
         </el-table-column>
+        <el-table-column label="备料人" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.采购员 }}
+          </template>
+        </el-table-column>
         <el-table-column label="备料时间" align="center" prop="下单日期" sortable="custom" width="120">
           <template slot-scope="scope">
             {{ scope.row.下单日期 ? scope.row.下单日期.split(' ')[0] : '' }}