项目管理

src/api/WorkshopProcurement/CreatingProcurementContracts.js

@@ -79,14 +79,14 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c
   })
 }
 // 生成采购合同
-export function doneContract(num1, RequisitionNumber, name1, time1, time2, num2, text, freight, num3, partsNum, priceGroup, taxGroup, currency, num4, id, singleQuota, readyQuota, AdvanceCharge) {
+export function doneContract(num1, RequisitionNumber, name1, time1, time2, num2, text, type, freight, num3, partsNum, priceGroup, taxGroup, currency, num4, id, singleQuota, readyQuota, AdvanceCharge) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间管理_基本件采购_请购单和请购单明细_增加数据',
-      param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&税率组=${taxGroup}&币种流水号组=${currency}&单件定额工时组=${singleQuota}&准结定额工时组=${readyQuota}&预付款=${AdvanceCharge}`
+      param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&模板类型=${type}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&税率组=${taxGroup}&币种流水号组=${currency}&单件定额工时组=${singleQuota}&准结定额工时组=${readyQuota}&预付款=${AdvanceCharge}`
     }
   })
 }

src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue

@@ -1430,6 +1430,7 @@ export default {
     },
     // 虚拟排产
     Discharge() {
+      this.bianliang1 = []
       for (let i = 0; i < this.tableData1.length; i++) {
         this.bianliang1.push(this.tableData1[i].工艺计划流水号)
       }

src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue

@@ -90,7 +90,7 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="发图" align="center" width="150px">
+        <el-table-column label="发图（计划）" align="center" width="150px">
           <template slot-scope="scope">
             <template v-if="scope.row.edit">
               <el-date-picker v-model="scope.row.机床设计完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
@@ -100,7 +100,12 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="采购" align="center" width="150px">
+        <el-table-column label="发图（实际）" align="center" width="150px">
+          <template slot-scope="scope">
+            <div class="bold-font">{{ scope.row.机床设计实际完成时间 }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="采购（计划）" align="center" width="150px">
           <template slot-scope="scope">
             <template v-if="scope.row.edit">
               <el-date-picker v-model="scope.row.采购完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
@@ -110,7 +115,12 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="备料" align="center" width="150px">
+        <el-table-column label="采购（实际）" align="center" width="150px">
+          <template slot-scope="scope">
+            <div class="bold-font">{{ scope.row.采购实际完成时间 }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="备料（计划）" align="center" width="150px">
           <template slot-scope="scope">
             <template v-if="scope.row.edit">
               <el-date-picker v-model="scope.row.备料完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
@@ -120,7 +130,12 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="制造" align="center" width="150px">
+        <el-table-column label="备料（实际）" align="center" width="150px">
+          <template slot-scope="scope">
+            <div class="bold-font">{{ scope.row.备料实际完成时间 }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="制造（计划）" align="center" width="150px">
           <template slot-scope="scope">
             <template v-if="scope.row.edit">
               <el-date-picker v-model="scope.row.机床生产完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
@@ -130,7 +145,12 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="装配" align="center" width="150px">
+        <el-table-column label="制造（实际）" align="center" width="150px">
+          <template slot-scope="scope">
+            <div class="bold-font">{{ scope.row.机床生产实际完成时间 }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="装配（计划）" align="center" width="150px">
           <template slot-scope="scope">
             <template v-if="scope.row.edit">
               <el-date-picker v-model="scope.row.机床装配完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
@@ -140,6 +160,11 @@
             </template>
           </template>
         </el-table-column>
+        <el-table-column label="装配（实际）" align="center" width="150px">
+          <template slot-scope="scope">
+            <div class="bold-font">{{ scope.row.机床装配实际完成时间 }}</div>
+          </template>
+        </el-table-column>
         <!--<el-table-column label="顺序" align="center" width="100px">-->
         <!--<template slot-scope="scope">-->
         <!--<template v-if="scope.row.edit">-->
@@ -415,6 +440,21 @@ export default {
             if (response.data.rows[i].机床装配完成时间 !== '' && response.data.rows[i].机床装配完成时间 !== null) {
               response.data.rows[i].机床装配完成时间 = response.data.rows[i].机床装配完成时间.split(' ')[0]
             }
+            if (response.data.rows[i].机床设计实际完成时间 !== '' && response.data.rows[i].机床设计实际完成时间 !== null) {
+              response.data.rows[i].机床设计实际完成时间 = response.data.rows[i].机床设计实际完成时间.split(' ')[0]
+            }
+            if (response.data.rows[i].采购实际完成时间 !== '' && response.data.rows[i].采购实际完成时间 !== null) {
+              response.data.rows[i].采购实际完成时间 = response.data.rows[i].采购实际完成时间.split(' ')[0]
+            }
+            if (response.data.rows[i].备料实际完成时间 !== '' && response.data.rows[i].备料实际完成时间 !== null) {
+              response.data.rows[i].备料实际完成时间 = response.data.rows[i].备料实际完成时间.split(' ')[0]
+            }
+            if (response.data.rows[i].机床生产实际完成时间 !== '' && response.data.rows[i].机床生产实际完成时间 !== null) {
+              response.data.rows[i].机床生产实际完成时间 = response.data.rows[i].机床生产实际完成时间.split(' ')[0]
+            }
+            if (response.data.rows[i].机床装配实际完成时间 !== '' && response.data.rows[i].机床装配实际完成时间 !== null) {
+              response.data.rows[i].机床装配实际完成时间 = response.data.rows[i].机床装配实际完成时间.split(' ')[0]
+            }
             this.tableData.push({
               edit: false,
               项目编号: response.data.rows[i].项目编号,
@@ -431,6 +471,11 @@ export default {
               备料完成时间: response.data.rows[i].备料完成时间,
               机床生产完成时间: response.data.rows[i].机床生产完成时间,
               机床装配完成时间: response.data.rows[i].机床装配完成时间,
+              机床设计实际完成时间: response.data.rows[i].机床设计实际完成时间,
+              采购实际完成时间: response.data.rows[i].采购实际完成时间,
+              备料实际完成时间: response.data.rows[i].备料实际完成时间,
+              机床生产实际完成时间: response.data.rows[i].机床生产实际完成时间,
+              机床装配实际完成时间: response.data.rows[i].机床装配实际完成时间,
               完成顺序: response.data.rows[i].完成顺序,
               更新: response.data.rows[i].更新,
               项目流水号: response.data.rows[i].项目流水号,

src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue

@@ -199,11 +199,18 @@
     </el-card>
     <el-card>
       <el-input :rows="20" v-model="textArea" type="textarea" style="width:calc(99% - 250px);float:right;margin-bottom: 20px" resize="none"/>
+      <el-select v-model="contractValue" size="small" style="width: 110px;margin-left: 7.5%;margin-top: 10px" @change="changeContract">
+        <el-option
+          v-for="item in contract"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
       <el-button
         type="primary"
         size="small"
         icon=""
-        style="margin-left: 4.5%"
+        style="margin-left: 7.5%; margin-top: 10px"
         @click="doneContract">生成采购合同</el-button>
     </el-card>
 
@@ -350,8 +357,16 @@ export default {
       deliveryDay1: [],
       contractNumValue: '',
       RequisitionNumber: '',
+      contract: [{
+        label: '合同模板1',
+        value: 1
+      }, {
+        label: '合同模板2',
+        value: 2
+      }],
+      contractValue: 1,
       contractNum: [], // 合同号
-      contractName: '产品购销合同', // 合同名称
+      contractName: '产品采购合同', // 合同名称
       supplierName: '', // 供应商
       supplier: [],
       supplierValue: '', // 供应商流水号
@@ -410,7 +425,7 @@ export default {
       planArrivalTime: '', // 计划到货时间
       stipulateArrivalTime: '', // 规定到货时间
       freight: '', // 运费
-      taxRate: '0.16', // 税率
+      taxRate: '0.13', // 税率
       tableData3: [],
       tableData4: [],
       groupNum1: [],
@@ -506,6 +521,11 @@ export default {
       })
       this.getSelect(initPurchaseOrder, ['请购单编号', '请购单流水号'], 'contractNum')
     },
+    changeContract() {
+      searchContractDemo(this.contractValue).then(response => {
+        this.textArea = response.data[0].合同模板内容
+      })
+    },
     searchSupplier() { // 查询创立日期和注册资本大于符合条件的数据
       this.supplierName ? this.supplierCheck1 = 1 : (this.supplierCheck1 = 0, this.supplierName = '')
       this.enterpriseNature ? this.supplierCheck2 = 1 : (this.supplierCheck2 = 0, this.enterpriseNature = '')
@@ -614,7 +634,7 @@ export default {
         this.group1 = this.group1.substr(0, this.group1.length - 1)
         this.group2 = this.group2.substr(0, this.group2.length - 1)
         this.group3 = this.group3.substr(0, this.group3.length - 1)
-        doneContract(this.contractNumValue, this.RequisitionNumber, this.contractName, this.planArrivalTime, this.stipulateArrivalTime, this.supplierValue, this.textArea, this.freight, this.group1, this.group2, this.group3, this.group7, this.group8, this.group9, this.id, this.group11, this.group12, this.AdvanceCharge).then(response => {
+        doneContract(this.contractNumValue, this.RequisitionNumber, this.contractName, this.planArrivalTime, this.stipulateArrivalTime, this.supplierValue, this.textArea, this.contractValue, this.freight, this.group1, this.group2, this.group3, this.group7, this.group8, this.group9, this.id, this.group11, this.group12, this.AdvanceCharge).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('生成合同成功')
             this.reload()