Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0

src/api/ManufacturingCenter/PartAssignment.js

@@ -118,19 +118,30 @@ export function searchDetailed(num) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间管理_基本件采购_请购单明细_查询数据',
+      name: '车间管理_基本件采购_请购单明细_查询数据_外购件',
       param: '请购单流水号=' + num
     }
   })
 }
-export function purchaseRequisition(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, BasicPartsNumber, MaterialName, NumberOfParts, PartType, time, MaterialNum) {
+export function searchDetailed1(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间管理_基本件采购_请购单明细_查询数据_基本件',
+      param: '请购单流水号=' + num
+    }
+  })
+}
+export function purchaseRequisition(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, BasicPartsNumber, MaterialName, PartToolNumber, Material, NumberOfParts, PartType, time, MaterialNum) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间管理_基本件采购_请购单明细_请购',
-      param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&基本件流水号=' + BasicPartsNumber + '&物料名称=' + MaterialName + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum
+      param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&基本件流水号=' + BasicPartsNumber + '&物料名称=' + MaterialName + '&零件图号=' + PartToolNumber + '&材料=' + Material + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum
     }
   })
 }

src/api/WorkshopProcurement/ArrivalStateSearch.js

@@ -31,7 +31,19 @@ export function searchArrivalNum(num) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间管理_合同物料到货情况_查询数据',
+      name: '车间管理_合同物料到货情况_查询数据_外购件',
+      param: `采购合同流水号=${num}`
+    }
+  })
+}
+// 查询到货情况
+export function searchArrivalNum1(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间管理_合同物料到货情况_查询数据_基本件',
       param: `采购合同流水号=${num}`
     }
   })

src/api/WorkshopProcurement/CreatingProcurementContracts.js

@@ -44,6 +44,28 @@ export function searchData(num) {
     }
   })
 }
+export function searchData1(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间管理_基本件采购_请购单明细_查询数据_外购件',
+      param: '请购单流水号=' + num
+    }
+  })
+}
+export function searchData2(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间管理_基本件采购_请购单明细_查询数据_基本件',
+      param: '请购单流水号=' + num
+    }
+  })
+}
 // 初始化付款时间节点
 export function initPayTimeNode() {
   return request({
@@ -116,14 +138,14 @@ export function searchSheetContract(num1) {
   })
 }
 // 生成采购合同
-export function doneContract(num1, RequisitionNumber, name1, time1, time2, method, num2, text, freight, num3, partsNum, priceGroup, dayGroup, payGroup, planGroup, taxGroup, currency, num4, id) {
+export function doneContract(num1, RequisitionNumber, name1, time1, time2, method, num2, text, freight, num3, partsNum, priceGroup, payGroup, planGroup, taxGroup, currency, num4, id) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间管理_基本件采购_请购单和请购单明细_增加数据',
-      param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&付款方式=${method}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&发货天数组=${dayGroup}&付款比例组=${payGroup}&计划付款时间组=${planGroup}&税率组=${taxGroup}&币种流水号组=${currency}`
+      param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&付款方式=${method}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&付款比例组=${payGroup}&计划付款时间组=${planGroup}&税率组=${taxGroup}&币种流水号组=${currency}`
     }
   })
 }

src/api/WorkshopProcurement/ProcurementContractApproval.js

@@ -43,7 +43,19 @@ export function searchTable2(num) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间采购管理_采购合同明细_查询数据',
+      name: '车间采购管理_采购合同_查询数据_外购件',
+      param: '采购合同流水号=' + num
+    }
+  })
+}
+// 采购合同明细查询
+export function searchTable3(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理_采购合同_查询数据_基本件',
       param: '采购合同流水号=' + num
     }
   })

src/api/WorkshopProcurement/ProcurementContractEnquiry.js

@@ -43,7 +43,19 @@ export function searchTable2(num) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间采购管理_采购合同明细_查询数据',
+      name: '车间采购管理_采购合同_查询数据_外购件',
+      param: '采购合同流水号=' + num
+    }
+  })
+}
+// 采购合同明细查询
+export function searchTable3(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理_采购合同_查询数据_基本件',
       param: '采购合同流水号=' + num
     }
   })

src/api/WorkshopProcurement/ProjectTotalSearch.js

@@ -30,7 +30,19 @@ export function searchProjectTotal1(num) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间采购管理_项目总价_明细_查询数据',
+      name: '车间采购管理_项目总价_明细_查询数据_外购件',
+      param: `项目流水号=${num}`
+    }
+  })
+}
+// 初始化项目金额统计表
+export function searchProjectTotal2(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理_项目总价_明细_查询数据_基本件',
       param: `项目流水号=${num}`
     }
   })

src/api/WorkshopProcurement/PurchaseContractChange.js

@@ -54,7 +54,19 @@ export function searchTable2(num) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间采购管理_采购合同明细_查询数据',
+      name: '车间采购管理_采购合同_查询数据_外购件',
+      param: '采购合同流水号=' + num
+    }
+  })
+}
+// 采购合同明细查询
+export function searchTable5(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理_采购合同_查询数据_基本件',
       param: '采购合同流水号=' + num
     }
   })
@@ -79,7 +91,18 @@ export function searchTable4(num) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间采购管理_采购合同明细变更_查询数据',
+      name: '车间采购管理_采购合同明细变更_查询数据_外购件',
+      param: '采购合同变更流水号=' + num
+    }
+  })
+}
+export function searchTable6(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理_采购合同明细变更_查询数据_基本件',
       param: '采购合同变更流水号=' + num
     }
   })

src/views/Assembly/AssemblyPlan/index.vue

@@ -62,7 +62,7 @@
         </el-table-column>
         <el-table-column align="center" label="计划完成日期">
           <template slot-scope="scope">
-            {{ scope.row.项目计划完成时间 }}
+            {{ scope.row.发货节点 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="客户名称">
@@ -144,9 +144,9 @@ export default {
       this.machineNumberValue ? this.check1 = 1 : this.check1 = 0
       searchTable(this.check, this.projectValue, this.check1, this.machineNumberValue, this.check2, this.startEndDate[0], this.startEndDate[1], this.pageCurrent, this.pageSize).then(response => {
         for (let i = 0; i < response.data.rows.length; i++) {
-          console.log(response.data.rows[i].项目计划完成时间)
+          console.log(response.data.rows[i].发货节点)
-          if (response.data.rows[i].项目计划完成时间 !== '') {
+          if (response.data.rows[i].发货节点 !== '') {
-            response.data.rows[i].项目计划完成时间 = (response.data.rows[i].项目计划完成时间).split(' ')[0]
+            response.data.rows[i].发货节点 = (response.data.rows[i].发货节点).split(' ')[0]
           }
         }
         this.tableData = response.data.rows

src/views/Assembly/PrintingAssemblyProcessCard/index.vue

@@ -99,9 +99,9 @@
             <td colspan="6">{{ list.工艺内容及装配具体要求 }}</td>
             <td align="center">{{ list.质检 }}</td>
             <td>{{ list.工时 }}</td>
-            <td>{{ list.装配员 }}</td>
+            <td/>
-            <td>{{ list.检验员 }}</td>
+            <td/>
-            <td width="100px">{{ list.备注 }}</td>
+            <td width="100px"/>
           </tr>
         </tbody>
       </table>

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -74,19 +74,19 @@
         <el-tab-pane label="基本件">
           <el-table :data="tableData1" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
             <el-table-column align="center" width="50" type="selection"/>
-            <el-table-column label="物料名称" align="center">
+            <el-table-column label="零件名称" align="center">
               <template slot-scope="scope">
                 {{ scope.row.零件名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="物料规格" align="center">
+            <el-table-column label="零件图号" align="center">
               <template slot-scope="scope">
-                {{ scope.row.物料规格 }}
+                {{ scope.row.零件图号 }}
               </template>
             </el-table-column>
-            <el-table-column label="物料型号" align="center">
+            <el-table-column label="材料" align="center">
               <template slot-scope="scope">
-                {{ scope.row.物料型号 }}
+                {{ scope.row.材料 }}
               </template>
             </el-table-column>
             <el-table-column label="零件数量" align="center">
@@ -228,6 +228,60 @@
         </el-table-column>
       </el-table>
     </el-card>
+    <el-card>
+      <el-table :data="tableData6" border size="mini" style="width: 100%" height="300px">
+        <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">
+          <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">
+          <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="250px" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="danger" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)">移出</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
     <el-card>
       <el-table :data="tableData5" border size="mini" style="width: 100%" height="300px">
         <el-table-column label="物料名称" align="center">
@@ -282,7 +336,6 @@
         </el-table-column>
       </el-table>
     </el-card>
-
     <el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="400px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-form-item label="请购单编号" prop="请购单编号">
@@ -323,12 +376,11 @@
         <el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
       </div>
     </el-dialog>
-
   </div>
 </template>
 
 <script>
-import { initProject, searchmachine, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, purchaseRequisition, purchaseRequisition1, MoveOut, MoveOut1, PurchasingDepartment, Production } from '@/api/ManufacturingCenter/PartAssignment'
+import { initProject, searchmachine, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, MoveOut, MoveOut1, PurchasingDepartment, Production } from '@/api/ManufacturingCenter/PartAssignment'
 import { mapGetters } from 'vuex'
 export default {
   inject: ['reload'],
@@ -352,6 +404,7 @@ export default {
       tableData3: [],
       tableData4: [],
       tableData5: [],
+      tableData6: [],
       loading: false,
       title: '',
       dialogFormVisible: false,
@@ -370,6 +423,7 @@ export default {
       StandardPartsAndOutsourcing: [],
       MaterialNum: [],
       MaterialName: [],
+      PartToolNumber: [],
       MaterialSpecification: [],
       MaterialModel: [],
       NumberOfParts: [],
@@ -589,22 +643,34 @@ export default {
         }
         this.tableData5 = response.data
       })
+      searchDetailed1(row.请购单流水号).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          if (response.data[i].物料计划到货时间 !== '') {
+            response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+          }
+        }
+        this.tableData6 = response.data
+      })
     },
     handleSelectionChange(val) {
       console.log(val)
       if (this.PartType === '基本件') {
+        this.MaterialNum = []
         this.BasicPartsNumber = []
         this.MaterialName = []
-        this.MaterialSpecification = []
+        this.PartToolNumber = []
-        this.MaterialModel = []
+        this.Material = []
         this.NumberOfParts = []
         for (let i = 0; i < val.length; i++) {
           this.MaterialNum[i] = val[i].物料流水号
           this.BasicPartsNumber[i] = val[i].基本件流水号
           this.MaterialName[i] = val[i].零件名称
+          this.PartToolNumber[i] = val[i].零件图号
+          this.Material[i] = val[i].材料
           this.NumberOfParts[i] = val[i].零件数量
         }
       } else if (this.PartType === '外购件') {
+        this.MaterialNum = []
         this.StandardPartsAndOutsourcing = []
         this.MaterialName = []
         this.MaterialSpecification = []
@@ -619,7 +685,12 @@ export default {
           this.NumberOfParts[i] = val[i].零件数量
         }
       } else if (this.PartType === '标准件') {
+        this.MaterialNum = []
         this.StandardPartsAndOutsourcing = []
+        this.MaterialName = []
+        this.MaterialSpecification = []
+        this.MaterialModel = []
+        this.NumberOfParts = []
         for (let i = 0; i < val.length; i++) {
           this.StandardPartsAndOutsourcing[i] = val[i].标准件和外购件流水号
           this.MaterialNum[i] = val[i].物料流水号
@@ -636,7 +707,7 @@ export default {
           this.result = 0
           if (this.PartType === '基本件') {
             for (let i = 0; i < this.BasicPartsNumber.length; i++) {
-              purchaseRequisition(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.BasicPartsNumber[i], this.MaterialName[i], this.NumberOfParts[i], 3, this.time, this.MaterialNum[i]).then(response => {
+              purchaseRequisition(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.BasicPartsNumber[i], this.MaterialName[i], this.PartToolNumber[i], this.Material[i], this.NumberOfParts[i], 3, this.time, this.MaterialNum[i]).then(response => {
                 this.result += parseInt(response.data[0].result)
                 console.log(this.result)
                 if (this.result === this.BasicPartsNumber.length) {
@@ -645,8 +716,13 @@ export default {
                   searchPart(this.groupFloatValue).then(response => {
                     this.tableData1 = response.data
                   })
-                  searchDetailed(this.RequisitionList).then(response => {
+                  searchDetailed1(this.RequisitionList).then(response => {
-                    this.tableData5 = response.data
+                    for (let i = 0; i < response.data.length; i++) {
+                      if (response.data[i].物料计划到货时间 !== '') {
+                        response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                      }
+                    }
+                    this.tableData6 = response.data
                   })
                 }
               })
@@ -661,6 +737,11 @@ export default {
                     this.tableData2 = response.data
                   })
                   searchDetailed(this.RequisitionList).then(response => {
+                    for (let i = 0; i < response.data.length; i++) {
+                      if (response.data[i].物料计划到货时间 !== '') {
+                        response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                      }
+                    }
                     this.tableData5 = response.data
                   })
                 }
@@ -676,6 +757,11 @@ export default {
                     this.tableData3 = response.data
                   })
                   searchDetailed(this.RequisitionList).then(response => {
+                    for (let i = 0; i < response.data.length; i++) {
+                      if (response.data[i].物料计划到货时间 !== '') {
+                        response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                      }
+                    }
                     this.tableData5 = response.data
                   })
                 }
@@ -690,10 +776,12 @@ export default {
       }
     },
     PurchasingDepartment() {
+      this.result = 0
       if (this.time !== '') {
         for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) {
           PurchasingDepartment(this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.time, this.MaterialNum[i], this.NumberOfParts[i], this.projectFloatValue, this.machineFloatValue).then(response => {
-            if (response.data[0].result === '1') {
+            this.result += parseInt(response.data[0].result)
+            if (this.result === this.StandardPartsAndOutsourcing.length) {
               this.$message.success('请购成功')
               if (this.PartType === '外购件') {
                 searchPart1(this.groupFloatValue, 2).then(response => {
@@ -704,7 +792,7 @@ export default {
                   this.tableData3 = response.data
                 })
               }
-            } else { this.$message.error('请购失败') }
+            }
           })
         }
       } else {

src/views/MarketingCenter/CRM/index.vue

@@ -400,6 +400,9 @@ export default {
       this.loading3 = true
       selectMarketingManager(this.AdressID).then(response => {
         this.loading3 = false
+        for (let i = 0; i < response.data.length; i++) {
+          response.data[i].出生日期 = (response.data[i].出生日期).split(' ')[0]
+        }
         this.tableData3 = response.data
       })
     },
@@ -438,6 +441,9 @@ export default {
         this.loading3 = false
         selectMarketingManager(data).then(response => {
           this.loading3 = false
+          for (let i = 0; i < response.data.length; i++) {
+            response.data[i].出生日期 = (response.data[i].出生日期).split(' ')[0]
+          }
           this.tableData3 = response.data
         })
       })
@@ -467,6 +473,9 @@ export default {
       function a() {
         selectMarketingManager(this.AdressID).then(response => {
           this.loading3 = false
+          for (let i = 0; i < response.data.length; i++) {
+            response.data[i].出生日期 = (response.data[i].出生日期).split(' ')[0]
+          }
           this.tableData3 = response.data
         })
       }
@@ -490,6 +499,9 @@ export default {
         this.loading3 = true
         selectMarketingManager(this.AdressID).then(response => {
           this.loading3 = false
+          for (let i = 0; i < response.data.length; i++) {
+            response.data[i].出生日期 = (response.data[i].出生日期).split(' ')[0]
+          }
           this.tableData3 = response.data
         })
       }

src/views/WorkshopProcurement/ArrivalStateSearch/index.vue

@@ -86,6 +86,38 @@
           @size-change="handleSizeChange1"
           @current-change="handleCurrentChange1"/>
       </div>
+      <el-table v-loading="" :data="tableData" stripe border style="width: 100%;max-height: 300px;margin-top: 10px" height="300px" size="mini">
+        <el-table-column label="采购合同编号" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.采购合同编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件名称" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.物料名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件图号" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="材料" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.材料 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="采购总数量" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="已到货数量" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.总到货数量 }}
+          </template>
+        </el-table-column>
+      </el-table>
       <el-table v-loading="" :data="tableData2" stripe border style="width: 100%;max-height: 300px;margin-top: 10px" height="300px" size="mini">
         <el-table-column label="采购合同编号" align="center" min-width="100">
           <template slot-scope="scope">
@@ -123,7 +155,7 @@
 </template>
 
 <script>
-import { initArrivalStateContact, searchArrivalState, searchArrivalNum } from '@/api/WorkshopProcurement/ArrivalStateSearch'
+import { initArrivalStateContact, searchArrivalState, searchArrivalNum, searchArrivalNum1 } from '@/api/WorkshopProcurement/ArrivalStateSearch'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -135,6 +167,7 @@ export default {
       contractNumValue: '',
       contractNum: [],
       supplierName: '',
+      tableData: [],
       tableData1: [],
       pageSize1: 10,
       pageCurrent1: 1,
@@ -203,6 +236,9 @@ export default {
       searchArrivalNum(row.采购合同流水号).then(response => {
         this.tableData2 = response.data
       })
+      searchArrivalNum1(row.采购合同流水号).then(response => {
+        this.tableData = response.data
+      })
     }
   }
 }

src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue

@@ -117,21 +117,12 @@
           <!--</el-select>-->
           <!--</el-form-item>-->
           <!--</el-col>-->
-          <el-col :span="6">
-            <el-form-item label="计划到货时间">
-              <el-date-picker
-                v-model="planArrivalTime"
-                size="small"
-                type="date"
-                format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期"/>
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item label="规定到货时间">
               <el-date-picker
                 v-model="stipulateArrivalTime"
+                :picker-options="endDateOpt"
+                :disabled="Boolean(!contractNumValue)"
                 size="small"
                 type="date"
                 format="yyyy-MM-dd"
@@ -140,13 +131,13 @@
                 @change="contractChange"/>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="6">
             <el-form-item label="采购员">
               <el-input v-model="name" size="small" readonly/>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="运费">
               <el-input v-model="freight" size="small"/>
@@ -162,22 +153,59 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="loading" :data="tableData3" border style="width: 100%;max-height: 400px;" height="400px" size="mini">
+      <el-table :data="tableData4" border style="width: 100%;max-height: 400px;" height="300px" size="mini">
-        <el-table-column label="参考价格" align="center" width="100">
+        <el-table-column label="单价" align="center" width="150">
-          <template slot-scope="scope">
-            {{ scope.row.参考价格 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="单价" align="center" width="100">
           <template slot-scope="scope">
             <el-input v-model="scope.row.单价" size="mini" style="width:70px"/>
           </template>
         </el-table-column>
-        <el-table-column label="发货天数" align="center" width="100">
+        <!--<el-table-column label="发货天数" align="center" width="150">-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-input v-model="deliveryDay1[scope.$index]" size="mini" style="width:70px"/>-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <el-table-column label="零件名称" align="center" min-width="200">
           <template slot-scope="scope">
-            <el-input v-model="deliveryDay[scope.$index]" size="mini" style="width:70px"/>
+            {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
+        <el-table-column label="零件图号" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="材料" align="center" width="200">
+          <template slot-scope="scope">
+            {{ scope.row.材料 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="订货数量" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.零件数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="金额" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.金额 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="物料计划到货时间" align="center" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.物料计划到货时间 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-table :data="tableData3" border style="width: 100%;max-height: 400px;" height="300px" size="mini">
+        <el-table-column label="单价" align="center" width="150">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.单价" size="mini" style="width:70px"/>
+          </template>
+        </el-table-column>
+        <!--<el-table-column label="发货天数" align="center" width="150">-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-input v-model="deliveryDay[scope.$index]" size="mini" style="width:70px"/>-->
+        <!--</template>-->
+        <!--</el-table-column>-->
         <el-table-column label="物料名称" align="center" min-width="200">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
@@ -377,13 +405,21 @@
 </template>
 
 <script>
-import { searchSupplier, initPayMethod, initPayTimeNode, searchSheetContract, doneContract, initPurchaseOrder, searchData, searchContractDemo } from '@/api/WorkshopProcurement/CreatingProcurementContracts'
+import { searchSupplier, initPayMethod, initPayTimeNode, doneContract, initPurchaseOrder, searchData, searchData1, searchData2, searchContractDemo } from '@/api/WorkshopProcurement/CreatingProcurementContracts'
 import { mapGetters } from 'vuex'
 export default {
   inject: ['reload'],
   data() {
     return {
       submitDisable: true, // 不点击表格中的行不让确定
+      minDate: null,
+      endDateOpt: { // 禁用大于规定到货日期和小于当前日期
+        disabledDate: (time) => {
+          if (this.minDate) {
+            return time.getTime() > this.minDate || time.getTime() < new Date()
+          }
+        }
+      },
       loading: false,
       dialogVisible1: false,
       disable2: true,
@@ -398,7 +434,9 @@ export default {
       textArea: '',
       paramRow: '', // 参数row
       contractSum: 0,
+      contractSum1: 0,
       deliveryDay: [],
+      deliveryDay1: [],
       contractNumValue: '',
       RequisitionNumber: '',
       contractNum: [], // 合同号
@@ -463,11 +501,12 @@ export default {
       freight: '', // 运费
       taxRate: '', // 税率
       tableData3: [],
+      tableData4: [],
       groupNum1: [],
+      groupNum2: [],
       group1: '',
       group2: '',
       group3: '',
-      group4: '',
       group5: '',
       group6: '',
       group7: '',
@@ -489,7 +528,14 @@ export default {
   },
   methods: {
     searchData() {
+      const numGroup = [] // 空数组，放物料的计划到货时间
       searchData(this.contractNumValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          numGroup.push(Date.parse(response.data[i].物料计划到货时间))
+        }
+        this.minDate = new Date(Math.min(...numGroup))
+      })
+      searchData1(this.contractNumValue).then(response => {
         for (let j = 0; j < response.data.length; j++) {
           response.data[j].物料计划到货时间 = (response.data[j].物料计划到货时间).split(' ')[0]
         }
@@ -500,19 +546,40 @@ export default {
         }
       }).then(() => {
         this.groupNum1 = this.tableData3 // 给中间变量，需要时重新push
+        console.log(this.tableData3)
+      })
+      searchData2(this.contractNumValue).then(response => {
+        for (let j = 0; j < response.data.length; j++) {
+          response.data[j].物料计划到货时间 = (response.data[j].物料计划到货时间).split(' ')[0]
+        }
+        this.tableData4 = response.data
+        for (let i = 0; i < response.data.length; i++) {
+          this.deliveryDay1[i] = 0
+          this.tableData4[i].金额 = parseFloat(this.tableData4[i].单价) * parseFloat(this.tableData4[i].零件数量)
+        }
+      }).then(() => {
+        this.groupNum2 = this.tableData4 // 给中间变量，需要时重新push
+        console.log(this.tableData4)
       })
     },
     calculateContractSum() { // 计算合同总额
       this.contractSum = 0
+      this.contractSum1 = 0
       this.costAccount = 0
       this.riseFallPoint = 0
       this.tableData3 = []
+      this.tableData4 = []
       for (let i = 0; i < this.groupNum1.length; i++) {
         this.groupNum1[i].金额 = parseFloat(this.groupNum1[i].单价) * parseFloat(this.groupNum1[i].零件数量)
         this.contractSum += parseFloat(this.groupNum1[i].金额)
         this.tableData3.push(this.groupNum1[i])
       }
-      this.contractSum = this.contractSum.toFixed(2)
+      for (let i = 0; i < this.groupNum2.length; i++) {
+        this.groupNum2[i].金额 = parseFloat(this.groupNum2[i].单价) * parseFloat(this.groupNum2[i].零件数量)
+        this.contractSum1 += parseFloat(this.groupNum2[i].金额)
+        this.tableData4.push(this.groupNum2[i])
+      }
+      this.contractSum = (this.contractSum + this.contractSum1).toFixed(2)
       this.costAccount = this.contractSum
       if (parseInt(this.costAccount) === 0) {
         this.$message.error('成本核算不可为0')
@@ -533,16 +600,7 @@ export default {
       })
     },
     contractChange() {
-      searchSheetContract(this.inquirySheetFlowNum).then(response => {
-        for (let i = 0; i < this.deliveryDay.length; i++) {
-          this.stipulateArrivalTime
-            ? (this.deliveryDay[i] = parseInt((Date.parse(this.stipulateArrivalTime) - new Date()) / (1000 * 60 * 60 * 24)))
-            : (this.deliveryDay[i] = 0)
-        }
-        this.tableData3 = response.data
-        this.calculateContractSum()
       this.searchDemo(this.paramRow)
-      })
     },
     fetchData() {
       searchContractDemo().then(response => { // 初始化合同模板
@@ -663,7 +721,6 @@ export default {
         this.group1 = ''
         this.group2 = ''
         this.group3 = ''
-        this.group4 = ''
         this.group5 = ''
         this.group6 = ''
         this.group7 = ''
@@ -674,11 +731,18 @@ export default {
           this.group1 += this.tableData3[i].物料流水号 + ','
           this.group2 += this.tableData3[i].零件数量 + ','
           this.group3 += this.tableData3[i].单价 + ','
-          this.group4 += this.deliveryDay[i] + ','
           this.group7 += this.taxRate + ','
           this.group8 += this.currencyValue + ','
           this.group9 += this.tableData3[i].请购单明细流水号 + ','
         }
+        for (let i = 0; i < this.tableData4.length; i++) {
+          this.group1 += this.tableData4[i].物料流水号 + ','
+          this.group2 += this.tableData4[i].零件数量 + ','
+          this.group3 += this.tableData4[i].单价 + ','
+          this.group7 += this.taxRate + ','
+          this.group8 += this.currencyValue + ','
+          this.group9 += this.tableData4[i].请购单明细流水号 + ','
+        }
         for (let i = 0; i < this.contractNum.length; i++) {
           if (this.contractNum[i].value === this.contractNumValue) {
             this.RequisitionNumber = this.contractNum[i].label
@@ -721,14 +785,13 @@ 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)
-        this.group4 = this.group4.substr(0, this.group4.length - 1)
         this.group5 = this.group5.substr(0, this.group5.length - 1)
         this.group6 = this.group6.substr(0, this.group6.length - 1)
         this.group7 = this.group7.substr(0, this.group7.length - 1)
         this.group8 = this.group8.substr(0, this.group8.length - 1)
         this.group9 = this.group9.substr(0, this.group9.length - 1)
         this.group10 = this.group10.substr(0, this.group10.length - 1)
-        doneContract(this.contractNumValue, this.RequisitionNumber, this.contractName, this.planArrivalTime, this.stipulateArrivalTime, this.payMethodName, this.supplierValue, this.textArea, this.freight, this.group1, this.group2, this.group3, this.group4, this.group5, this.group6, this.group7, this.group8, this.group9, this.id).then(response => {
+        doneContract(this.contractNumValue, this.RequisitionNumber, this.contractName, this.planArrivalTime, this.stipulateArrivalTime, this.payMethodName, this.supplierValue, this.textArea, this.freight, this.group1, this.group2, this.group3, this.group5, this.group6, this.group7, this.group8, this.group9, this.id).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('生成合同成功')
             this.reload()

src/views/WorkshopProcurement/ProcurementContractApproval/index.vue

@@ -1,16 +1,6 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>时间段:</span>
-      <el-date-picker
-        v-model="startEndDate"
-        style="width:250px"
-        size="small"
-        type="daterange"
-        value-format="yyyy-MM-dd"
-        format="yyyy-MM-dd"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"/>
       <span>合同号:</span>
       <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>
         <el-option
@@ -54,11 +44,6 @@
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="预到货时间" align="center" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.预到货时间 }}
-          </template>
-        </el-table-column>
         <el-table-column label="规定到货时间" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.规定到货时间 }}
@@ -125,13 +110,25 @@
             </tr>
           </table>
           <div>一、 产品名称、型号、数量、单价、品牌：</div>
+          <table id="50" cellspacing="0px" align="center" border width="100%" style="">
+            <tbody id="51">
+              <tr id="tableHead1" style="height: 40px">
+                <td colspan="2" align="center">零件名称</td>
+                <td colspan="1" align="center">零件图号</td>
+                <td colspan="1" align="center">材料</td>
+                <td colspan="1" align="center">数量</td>
+                <td colspan="1" align="center">单价</td>
+                <td colspan="1" align="center">总价</td>
+              </tr>
+            </tbody>
+          </table>
+          <hr>
           <table id="2" cellspacing="0px" align="center" border width="100%" style="">
             <tbody id="4">
               <tr id="tableHead" style="height: 40px">
-                <td colspan="1" align="center">物料名称</td>
+                <td colspan="2" align="center">物料名称</td>
                 <td colspan="1" align="center">物料规格</td>
                 <td colspan="1" align="center">物料型号</td>
-                <td colspan="1" align="center">发货天数</td>
                 <td colspan="1" align="center">数量</td>
                 <td colspan="1" align="center">单价</td>
                 <td colspan="1" align="center">总价</td>
@@ -216,7 +213,7 @@
 </template>
 
 <script>
-import { initContract, initBuyer, searchTable1, searchTable2, submitApproval } from '@/api/WorkshopProcurement/ProcurementContractApproval'
+import { initContract, initBuyer, searchTable1, searchTable2, searchTable3, submitApproval } from '@/api/WorkshopProcurement/ProcurementContractApproval'
 
 export default {
   data() {
@@ -247,6 +244,7 @@ export default {
       dialogVisible3: false,
       form1: {},
       returns: [],
+      returns1: [],
       tableData01: [],
       tableData02: [],
       submitDisable: true,
@@ -389,7 +387,7 @@ export default {
         for (let i = 0; i < this.returns.length; i++) {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData')
-          tr[i].innerHTML = '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
+          tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
               '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead').after(tr[i])
         }
@@ -397,10 +395,35 @@ export default {
           document.getElementsByClassName('tableData')[j].children[0].innerHTML = response.data[j].物料名称
           document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].物料规格
           document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].物料型号
-          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].发货天数
+          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].金额
-          document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].金额
+        }
+      })
+      searchTable3(this.contractValue).then(response => {
+        this.returns1 = response.data
+        const children1 = document.getElementsByClassName('tableData1')
+        const parent1 = document.getElementById('51')
+        if (children1.length !== 0) {
+          for (let i = children1.length - 1; i >= 0; i--) {
+            parent1.removeChild(children1[i])
+          }
+        }
+        const tr = []
+        for (let i = 0; i < this.returns1.length; i++) {
+          tr[i] = document.createElement('tr')
+          tr[i].setAttribute('class', 'tableData1')
+          tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
+            '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
+          document.getElementById('tableHead1').after(tr[i])
+        }
+        for (let j = 0; j < this.returns1.length; j++) {
+          document.getElementsByClassName('tableData1')[j].children[0].innerHTML = response.data[j].物料名称
+          document.getElementsByClassName('tableData1')[j].children[1].innerHTML = response.data[j].零件图号
+          document.getElementsByClassName('tableData1')[j].children[2].innerHTML = response.data[j].材料
+          document.getElementsByClassName('tableData1')[j].children[3].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData1')[j].children[4].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData1')[j].children[5].innerHTML = response.data[j].金额
         }
       })
     }
@@ -432,4 +455,7 @@ export default {
   .tableData{
     height: 30px;
   }
+  .tableData1{
+    height: 30px;
+  }
 </style>

src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue

@@ -1,16 +1,6 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>时间段:</span>
-      <el-date-picker
-        v-model="startEndDate"
-        style="width:250px"
-        size="small"
-        type="daterange"
-        value-format="yyyy-MM-dd"
-        format="yyyy-MM-dd"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"/>
       <span>合同号:</span>
       <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>
         <el-option
@@ -139,13 +129,25 @@
             </tr>
           </table>
           <div>一、 产品名称、型号、数量、单价、品牌：</div>
+          <table id="50" cellspacing="0px" align="center" border width="100%" style="">
+            <tbody id="51">
+              <tr id="tableHead1" style="height: 40px">
+                <td colspan="2" align="center">零件名称</td>
+                <td colspan="1" align="center">零件图号</td>
+                <td colspan="1" align="center">材料</td>
+                <td colspan="1" align="center">数量</td>
+                <td colspan="1" align="center">单价</td>
+                <td colspan="1" align="center">总价</td>
+              </tr>
+            </tbody>
+          </table>
+          <hr>
           <table id="2" cellspacing="0px" align="center" border width="100%" style="">
             <tbody id="4">
               <tr id="tableHead" style="height: 40px">
-                <td colspan="1" align="center">物料名称</td>
+                <td colspan="2" align="center">物料名称</td>
                 <td colspan="1" align="center">物料规格</td>
                 <td colspan="1" align="center">物料型号</td>
-                <td colspan="1" align="center">发货天数</td>
                 <td colspan="1" align="center">数量</td>
                 <td colspan="1" align="center">单价</td>
                 <td colspan="1" align="center">总价</td>
@@ -211,7 +213,7 @@
 </template>
 
 <script>
-import { initContract, initBuyer, searchTable1, searchTable2, Disable } from '@/api/WorkshopProcurement/ProcurementContractEnquiry'
+import { initContract, initBuyer, searchTable1, searchTable2, searchTable3, Disable } from '@/api/WorkshopProcurement/ProcurementContractEnquiry'
 
 export default {
   data() {
@@ -257,6 +259,7 @@ export default {
       form1: {},
       goodTime: '',
       returns: [],
+      returns1: [],
       tableData02: [],
       submitDisable: true,
       dialogVisible2: false,
@@ -380,7 +383,7 @@ export default {
         for (let i = 0; i < this.returns.length; i++) {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData')
-          tr[i].innerHTML = '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
+          tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
               '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead').after(tr[i])
         }
@@ -388,10 +391,35 @@ export default {
           document.getElementsByClassName('tableData')[j].children[0].innerHTML = response.data[j].物料名称
           document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].物料规格
           document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].物料型号
-          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].发货天数
+          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].金额
-          document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].金额
+        }
+      })
+      searchTable3(this.contractValue).then(response => {
+        this.returns1 = response.data
+        const children1 = document.getElementsByClassName('tableData1')
+        const parent1 = document.getElementById('51')
+        if (children1.length !== 0) {
+          for (let i = children1.length - 1; i >= 0; i--) {
+            parent1.removeChild(children1[i])
+          }
+        }
+        const tr = []
+        for (let i = 0; i < this.returns1.length; i++) {
+          tr[i] = document.createElement('tr')
+          tr[i].setAttribute('class', 'tableData1')
+          tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
+            '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
+          document.getElementById('tableHead1').after(tr[i])
+        }
+        for (let j = 0; j < this.returns1.length; j++) {
+          document.getElementsByClassName('tableData1')[j].children[0].innerHTML = response.data[j].物料名称
+          document.getElementsByClassName('tableData1')[j].children[1].innerHTML = response.data[j].零件图号
+          document.getElementsByClassName('tableData1')[j].children[2].innerHTML = response.data[j].材料
+          document.getElementsByClassName('tableData1')[j].children[3].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData1')[j].children[4].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData1')[j].children[5].innerHTML = response.data[j].金额
         }
       })
     }
@@ -423,6 +451,9 @@ export default {
   .tableData{
     height: 30px;
   }
+  .tableData1{
+    height: 30px;
+  }
   .el-table .adopt{
     background: limegreen;
   }

src/views/WorkshopProcurement/ProjectTotalSearch/index.vue

@@ -60,6 +60,43 @@
 
     <el-card>
       <div style="margin-bottom: 20px;margin-left: 10px;font-size: 20px;">车间采购</div>
+      <el-table v-loading="" :data="tableData2" show-summary border style="width: 100%;max-height: 500px;" height="300px" size="mini">
+        <el-table-column label="项目名称" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.项目名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件名称" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.物料名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件图号" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="材料" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.材料 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="数量" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="单价" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.单价 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="小计(元)" align="center" min-width="100" prop="金额">
+          <template slot-scope="scope">
+            {{ scope.row.金额 }}
+          </template>
+        </el-table-column>
+      </el-table>
       <el-table v-loading="" :data="tableData" show-summary border style="width: 100%;max-height: 500px;" height="300px" size="mini">
         <el-table-column label="项目名称" align="center" min-width="100">
           <template slot-scope="scope">
@@ -102,7 +139,7 @@
 </template>
 
 <script>
-import { initProject, searchProjectTotal, searchProjectTotal1 } from '@/api/WorkshopProcurement/ProjectTotalSearch'
+import { initProject, searchProjectTotal, searchProjectTotal1, searchProjectTotal2 } from '@/api/WorkshopProcurement/ProjectTotalSearch'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -111,11 +148,9 @@ export default {
     return {
       projectValue: '',
       project: [],
-      pageCurrent1: 1,
-      pageSize1: 10,
-      total1: 0,
       tableData: [],
-      tableData1: []
+      tableData1: [],
+      tableData2: []
     }
   },
   computed: {
@@ -143,25 +178,17 @@ export default {
     searchTable1() {
       if (this.projectValue) {
         searchProjectTotal(this.projectValue).then(response => {
-          console.log(response.data)
           this.tableData1 = response.data
         })
         searchProjectTotal1(this.projectValue).then(response => {
-          console.log(response.data)
           this.tableData = response.data
         })
+        searchProjectTotal2(this.projectValue).then(response => {
+          this.tableData2 = response.data
+        })
       } else {
         this.$message.error('请选择项目')
       }
-    },
-    handleSizeChange1(val) {
-      this.pageSize1 = val
-      this.pageCurrent1 = 1
-      this.searchTable1()
-    },
-    handleCurrentChange1(val) {
-      this.pageCurrent1 = val
-      this.searchTable1()
     }
   }
 }

src/views/WorkshopProcurement/PurchaseContractChange/index.vue

@@ -104,13 +104,25 @@
                 </tr>
               </table>
               <div>一、 产品名称、型号、数量、单价、品牌：</div>
+              <table id="50" cellspacing="0px" align="center" border width="100%" style="">
+                <tbody id="51">
+                  <tr id="tableHead2" style="height: 40px">
+                    <td colspan="2" align="center">零件名称</td>
+                    <td colspan="1" align="center">零件图号</td>
+                    <td colspan="1" align="center">材料</td>
+                    <td colspan="1" align="center">数量</td>
+                    <td colspan="1" align="center">单价</td>
+                    <td colspan="1" align="center">总价</td>
+                  </tr>
+                </tbody>
+              </table>
+              <hr>
               <table id="2" cellspacing="0px" align="center" border width="100%" style="">
                 <tbody id="4">
                   <tr id="tableHead" style="height: 40px">
-                    <td colspan="1" align="center">物料名称</td>
+                    <td colspan="2" align="center">物料名称</td>
                     <td colspan="1" align="center">物料规格</td>
                     <td colspan="1" align="center">物料型号</td>
-                    <td colspan="1" align="center">发货天数</td>
                     <td colspan="1" align="center">数量</td>
                     <td colspan="1" align="center">单价</td>
                     <td colspan="1" align="center">总价</td>
@@ -143,7 +155,7 @@
         <el-row>
           <span>时间段:</span>
           <el-date-picker
-            v-model="startEndDate"
+            v-model="startEndDate1"
             style="width:240px"
             size="small"
             type="daterange"
@@ -247,13 +259,25 @@
                 </tr>
               </table>
               <div>一、 产品名称、型号、数量、单价、品牌：</div>
+              <table id="52" cellspacing="0px" align="center" border width="100%" style="">
+                <tbody id="53">
+                  <tr id="tableHead3" style="height: 40px">
+                    <td colspan="2" align="center">零件名称</td>
+                    <td colspan="1" align="center">零件图号</td>
+                    <td colspan="1" align="center">材料</td>
+                    <td colspan="1" align="center">数量</td>
+                    <td colspan="1" align="center">单价</td>
+                    <td colspan="1" align="center">总价</td>
+                  </tr>
+                </tbody>
+              </table>
+              <hr>
               <table id="5" cellspacing="0px" align="center" border width="100%" style="">
                 <tbody id="6">
                   <tr id="tableHead1" style="height: 40px">
-                    <td colspan="1" align="center">物料名称</td>
+                    <td colspan="2" align="center">物料名称</td>
                     <td colspan="1" align="center">物料规格</td>
                     <td colspan="1" align="center">物料型号</td>
-                    <td colspan="1" align="center">发货天数</td>
                     <td colspan="1" align="center">数量</td>
                     <td colspan="1" align="center">单价</td>
                     <td colspan="1" align="center">总价</td>
@@ -331,7 +355,7 @@
 </template>
 
 <script>
-import { initContract, initContract1, initBuyer, searchTable1, searchTable2, searchTable3, searchTable4, submitContract } from '@/api/WorkshopProcurement/PurchaseContractChange'
+import { initContract, initContract1, initBuyer, searchTable1, searchTable2, searchTable3, searchTable4, searchTable5, searchTable6, submitContract } from '@/api/WorkshopProcurement/PurchaseContractChange'
 
 export default {
   data() {
@@ -346,6 +370,7 @@ export default {
       check4: 0,
       check5: 0,
       startEndDate: '',
+      startEndDate1: '',
       contract: '',
       contract1: '',
       freight: '',
@@ -387,6 +412,8 @@ export default {
       },
       returns: [],
       returns1: [],
+      returns2: [],
+      returns3: [],
       tableData01: [],
       tableData02: [],
       submitDisable: true,
@@ -471,14 +498,14 @@ export default {
     searchTable3() {
       this.textarea1 = ``
       this.loading2 = true
-      if (this.startEndDate === '' || this.startEndDate === null || this.startEndDate[0] === '' || this.startEndDate[1] === '') {
+      if (this.startEndDate1 === '' || this.startEndDate1 === null || this.startEndDate1[0] === '' || this.startEndDate1[1] === '') {
         this.check1 = 0
-        this.startEndDate = ''
+        this.startEndDate1 = ''
       } else { this.check1 = 1 }
       this.contractNumValue1 ? this.check2 = 1 : this.check2 = 0
       this.buyerName1 ? this.check3 = 1 : this.check3 = 0
       this.supplierName1 ? this.check4 = 1 : this.check4 = 0
-      searchTable3(this.pageCurrent2, this.pageSize2, this.check1, this.startEndDate[0], this.startEndDate[1], this.check2, this.contractNumValue1, this.check3, this.buyerValue1, this.check4, this.supplierName1).then(response => {
+      searchTable3(this.pageCurrent2, this.pageSize2, this.check1, this.startEndDate1[0], this.startEndDate1[1], this.check2, this.contractNumValue1, this.check3, this.buyerValue1, this.check4, this.supplierName1).then(response => {
         this.loading2 = false
         for (let j = 0; j < response.data.rows.length; j++) {
           if (response.data.rows[j].规定到货时间 !== null) {
@@ -553,7 +580,7 @@ export default {
         for (let i = 0; i < this.returns.length; i++) {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData')
-          tr[i].innerHTML = '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
+          tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
               '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead').after(tr[i])
         }
@@ -561,10 +588,35 @@ export default {
           document.getElementsByClassName('tableData')[j].children[0].innerHTML = response.data[j].物料名称
           document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].物料规格
           document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].物料型号
-          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].发货天数
+          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].金额
-          document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].金额
+        }
+      })
+      searchTable5(this.contractValue).then(response => {
+        this.returns2 = response.data
+        const children2 = document.getElementsByClassName('tableData2')
+        const parent2 = document.getElementById('51')
+        if (children2.length !== 0) {
+          for (let i = children2.length - 1; i >= 0; i--) {
+            parent2.removeChild(children2[i])
+          }
+        }
+        const tr = []
+        for (let i = 0; i < this.returns2.length; i++) {
+          tr[i] = document.createElement('tr')
+          tr[i].setAttribute('class', 'tableData2')
+          tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
+            '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
+          document.getElementById('tableHead2').after(tr[i])
+        }
+        for (let j = 0; j < this.returns2.length; j++) {
+          document.getElementsByClassName('tableData2')[j].children[0].innerHTML = response.data[j].物料名称
+          document.getElementsByClassName('tableData2')[j].children[1].innerHTML = response.data[j].零件图号
+          document.getElementsByClassName('tableData2')[j].children[2].innerHTML = response.data[j].材料
+          document.getElementsByClassName('tableData2')[j].children[3].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData2')[j].children[4].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData2')[j].children[5].innerHTML = response.data[j].金额
         }
       })
     },
@@ -591,7 +643,7 @@ export default {
         for (let i = 0; i < this.returns1.length; i++) {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData1')
-          tr[i].innerHTML = '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
+          tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
               '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead1').after(tr[i])
         }
@@ -599,10 +651,35 @@ export default {
           document.getElementsByClassName('tableData1')[j].children[0].innerHTML = response.data[j].物料名称
           document.getElementsByClassName('tableData1')[j].children[1].innerHTML = response.data[j].物料规格
           document.getElementsByClassName('tableData1')[j].children[2].innerHTML = response.data[j].物料型号
-          document.getElementsByClassName('tableData1')[j].children[3].innerHTML = response.data[j].发货天数
+          document.getElementsByClassName('tableData1')[j].children[3].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData1')[j].children[4].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData1')[j].children[4].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData1')[j].children[5].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData1')[j].children[5].innerHTML = response.data[j].金额
-          document.getElementsByClassName('tableData1')[j].children[6].innerHTML = response.data[j].金额
+        }
+      })
+      searchTable6(this.contractValue1).then(response => {
+        this.returns3 = response.data
+        const children3 = document.getElementsByClassName('tableData3')
+        const parent3 = document.getElementById('53')
+        if (children3.length !== 0) {
+          for (let i = children3.length - 1; i >= 0; i--) {
+            parent3.removeChild(children3[i])
+          }
+        }
+        const tr = []
+        for (let i = 0; i < this.returns3.length; i++) {
+          tr[i] = document.createElement('tr')
+          tr[i].setAttribute('class', 'tableData3')
+          tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
+            '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
+          document.getElementById('tableHead3').after(tr[i])
+        }
+        for (let j = 0; j < this.returns3.length; j++) {
+          document.getElementsByClassName('tableData3')[j].children[0].innerHTML = response.data[j].物料名称
+          document.getElementsByClassName('tableData3')[j].children[1].innerHTML = response.data[j].零件图号
+          document.getElementsByClassName('tableData3')[j].children[2].innerHTML = response.data[j].材料
+          document.getElementsByClassName('tableData3')[j].children[3].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData3')[j].children[4].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData3')[j].children[5].innerHTML = response.data[j].金额
         }
       })
     }
@@ -631,7 +708,16 @@ export default {
   }
 </style>
 <style>
+  .tableData{
+    height: 30px;
+  }
   .tableData1{
     height: 30px;
   }
+  .tableData2{
+    height: 30px;
+  }
+  .tableData3{
+    height: 30px;
+  }
 </style>

src/views/WorkshopProcurement/PurchasingQualityInspection/index.vue

@@ -15,8 +15,8 @@
         </el-select>
         <span>供应商:</span>
         <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width: 200px"/>
-        <span>零件号:</span>
+        <span>零件名称:</span>
-        <el-select v-model="PartNumberValue" placeholder="零件号" size="small" clearable>
+        <el-select v-model="PartNumberValue" placeholder="零件名称" size="small" clearable>
           <el-option
             v-for="item in PartNumber"
             :key="item.value"
@@ -198,12 +198,16 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        if (row.交检日期 !== '' && row.检查日期 !== '') {
           editData(row.id).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('通过成功')
               this.searchTable()
             } else { this.$message.error('通过失败') }
           })
+        } else {
+          this.$message.warning('请填写信息')
+        }
       }).catch(() => {
         this.$message({
           type: 'info',

src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <span>发票号:</span>
-      <el-input v-model="invoiceNum" size="small" clearable/>
+      <el-input v-model="invoiceNum" placeholder="发票号" size="small" clearable/>
       <!--<span>开票时间:</span>-->
       <!--<el-date-picker v-model="invoiceTime" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>-->
       <span>采购合同号:</span>