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

src/api/ManufacturingCenter/GroupMatching.js

@@ -56,3 +56,15 @@ export function searchPurchaseTable(check, entryNameValue, check1, machine, chec
     }
   })
 }
+export function searchTable1(check, entryNameValue, check1, machine, check2, groupNum, check3, year, check4, month, check5, time, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '库存管理_车间采购出库_零件查询',
+      param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&年_check=' + check3 + '=int&年=' + year + '=string&月_check=' + check4 + '=int&月=' + month + '=int&入库时间_check=' + check5 + '=int&入库时间=' + time + '=string',
+      pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}

src/api/ManufacturingCenter/WorkshopEquipmentManagement.js

@@ -6,7 +6,7 @@ export function getData(check, equipmentName, pageCurrent, pageSize) {
     method: 'post',
     data: {
       type: '1',
-      name: '设备管理_设备加工能力_查询数据_设备维护',
+      name: '设备管理_设备加工能力_查询数据_设备维护NEW',
       param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName,
       pagination: pageCurrent + '&' + pageSize
     }

src/api/PurchasingCenter/ReceiptConnectionSheet.js

@@ -49,8 +49,8 @@ export function deleteInvoice(num1) {
     }
   })
 }
-// 传送人接收人初始化 采购科改16
+// 传送人初始化 采购科改16
-export function initPerson() {
+export function initSender() {
   return request({
     url: '',
     method: 'post',
@@ -61,6 +61,18 @@ export function initPerson() {
     }
   })
 }
+// 接收人初始化 财务部7
+export function initReceiver() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
+      param: '考核部门编号=7'
+    }
+  })
+}
 // 初始化合同号
 export function initContract() {
   return request({

src/views/ManufacturingCenter/GroupMatching/index.vue

@@ -158,13 +158,83 @@
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
-          :current-page="PageCurrent1"
+          :current-page="pageCurrent4"
           :page-sizes="[10, 20, 30, 40]"
-          :page-size="10"
+          :page-size="pageSize4"
-          :total="total1"
+          :total="total4"
           layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange1"
+          @size-change="handleSizeChange4"
-          @current-change="handleCurrentChange1"/>
+          @current-change="handleCurrentChange4"/>
+      </div>
+    </el-card>
+
+    <el-card>
+      <el-table
+        v-loading="listLoading2"
+        :data="tableData1"
+        border
+        style="width: 100%;"
+        height="300">
+        <el-table-column
+          label="序号"
+          align="center"
+          type="index"
+          width="50"/>
+        <el-table-column label="物料名称" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.物料名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="物料规格" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.物料规格 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="物料型号" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.物料型号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="项目名称" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.项目名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床图号" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="组号" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.组号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件数量" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.货位存量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件类型" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.类型名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="入库时间" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.入库时间 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="pageCurrent5"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pageSize5"
+          :total="total5"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange5"
+          @current-change="handleCurrentChange5"/>
       </div>
     </el-card>
     <el-dialog :visible.sync="dialogFormVisible2" title="选择机床" center style="min-height: 300px">
@@ -273,7 +343,7 @@
 </template>
 
 <script>
-import { initProject, searchTable, searchmachine, searchgroup, searchPurchaseTable } from '@/api/ManufacturingCenter/GroupMatching'
+import { initProject, searchTable, searchmachine, searchgroup, searchPurchaseTable, searchTable1 } from '@/api/ManufacturingCenter/GroupMatching'
 export default {
   data() {
     return {
@@ -293,13 +363,22 @@ export default {
       pageSize1: 10,
       pageCurrent2: 1,
       pageSize2: 10,
+      pageCurrent4: 1,
+      pageSize4: 10,
+      pageCurrent5: 1,
+      pageSize5: 10,
       tableData7: [],
       tableData6: [],
       tableData: [],
+      tableData1: [],
       state: null,
-      total: null,
+      listLoading1: false,
-      total1: null,
+      listLoading2: false,
-      total2: null,
+      total: 0,
+      total1: 0,
+      total2: 0,
+      total4: 0,
+      total5: 0,
       title: '',
       dialogFormVisible2: false,
       dialogFormVisible3: false,
@@ -359,6 +438,8 @@ export default {
   methods: {
     searchData() {
       this.loading = true
+      this.listLoading1 = true
+      this.listLoading2 = true
       if (this.entryNameValue !== null && this.entryNameValue !== '') {
         if (this.entryNameValue !== null && this.entryNameValue !== '') {
           this.check = 1
@@ -406,8 +487,14 @@ export default {
         searchPurchaseTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
           console.log(response)
           this.tableDataPurchase = response.data.rows
-          this.listLoading = false
+          this.listLoading1 = false
-          this.total1 = response.data.total
+          this.total4 = parseInt(response.data.total)
+        })
+        searchTable1(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
+          console.log(response)
+          this.tableData1 = response.data.rows
+          this.listLoading2 = false
+          this.total5 = parseInt(response.data.total)
         })
       } else {
         this.loading = false
@@ -481,11 +568,105 @@ export default {
     handleSizeChange(val) {
       this.pageCurrent = 1
       this.pageSize = val
-      this.searchData()
+      if (this.entryNameValue !== null && this.entryNameValue !== '') {
+        if (this.entryNameValue !== null && this.entryNameValue !== '') {
+          this.check = 1
+        } else {
+          this.check = 0
+        }
+        if (this.machineToolNumber !== '') {
+          this.check1 = 1
+        } else {
+          this.check1 = 0
+        }
+        if (this.groupNumber !== '') {
+          this.check2 = 1
+        } else {
+          this.check2 = 0
+        }
+        if (this.year !== null && this.year !== '') {
+          this.check3 = 1
+        } else {
+          this.check3 = 0
+        }
+        if (this.month !== null && this.month !== '') {
+          this.check4 = 1
+        } else {
+          this.check4 = 0
+        }
+        if (this.time !== '' && this.time !== null) {
+          this.check5 = 1
+        } else {
+          this.check5 = 0
+        }
+        searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
+          for (let i = 0; i < response.data.rows.length; i++) {
+            if (response.data.rows[i].入库时间 !== null) {
+              response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
+            }
+            if (response.data.rows[i].计划完成时间 !== null) {
+              response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
+            }
+          }
+          this.tableData = response.data.rows
+          this.total = parseInt(response.data.total)
+          this.loading = false
+        })
+      } else {
+        this.loading = false
+        this.$message.warning('请先选择项目')
+      }
     },
     handleCurrentChange(val) {
       this.pageCurrent = val
-      this.searchData()
+      if (this.entryNameValue !== null && this.entryNameValue !== '') {
+        if (this.entryNameValue !== null && this.entryNameValue !== '') {
+          this.check = 1
+        } else {
+          this.check = 0
+        }
+        if (this.machineToolNumber !== '') {
+          this.check1 = 1
+        } else {
+          this.check1 = 0
+        }
+        if (this.groupNumber !== '') {
+          this.check2 = 1
+        } else {
+          this.check2 = 0
+        }
+        if (this.year !== null && this.year !== '') {
+          this.check3 = 1
+        } else {
+          this.check3 = 0
+        }
+        if (this.month !== null && this.month !== '') {
+          this.check4 = 1
+        } else {
+          this.check4 = 0
+        }
+        if (this.time !== '' && this.time !== null) {
+          this.check5 = 1
+        } else {
+          this.check5 = 0
+        }
+        searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
+          for (let i = 0; i < response.data.rows.length; i++) {
+            if (response.data.rows[i].入库时间 !== null) {
+              response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
+            }
+            if (response.data.rows[i].计划完成时间 !== null) {
+              response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
+            }
+          }
+          this.tableData = response.data.rows
+          this.total = parseInt(response.data.total)
+          this.loading = false
+        })
+      } else {
+        this.loading = false
+        this.$message.warning('请先选择项目')
+      }
     },
     handleSizeChange1(val) {
       this.pageCurrent1 = 1
@@ -504,6 +685,184 @@ export default {
     handleCurrentChange3(val) {
       this.pageCurrent2 = val
       this.searchGroupList()
+    },
+    handleSizeChange4(val) {
+      this.pageCurrent4 = 1
+      this.pageSize4 = val
+      if (this.entryNameValue !== null && this.entryNameValue !== '') {
+        if (this.entryNameValue !== null && this.entryNameValue !== '') {
+          this.check = 1
+        } else {
+          this.check = 0
+        }
+        if (this.machineToolNumber !== '') {
+          this.check1 = 1
+        } else {
+          this.check1 = 0
+        }
+        if (this.groupNumber !== '') {
+          this.check2 = 1
+        } else {
+          this.check2 = 0
+        }
+        if (this.year !== null && this.year !== '') {
+          this.check3 = 1
+        } else {
+          this.check3 = 0
+        }
+        if (this.month !== null && this.month !== '') {
+          this.check4 = 1
+        } else {
+          this.check4 = 0
+        }
+        if (this.time !== '' && this.time !== null) {
+          this.check5 = 1
+        } else {
+          this.check5 = 0
+        }
+        searchPurchaseTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent4, this.pageSize4).then(response => {
+          console.log(response)
+          this.tableDataPurchase = response.data.rows
+          this.listLoading1 = false
+          this.total4 = parseInt(response.data.total)
+        })
+      } else {
+        this.loading = false
+        this.$message.warning('请先选择项目')
+      }
+    },
+    handleCurrentChange4(val) {
+      this.pageCurrent4 = val
+      if (this.entryNameValue !== null && this.entryNameValue !== '') {
+        if (this.entryNameValue !== null && this.entryNameValue !== '') {
+          this.check = 1
+        } else {
+          this.check = 0
+        }
+        if (this.machineToolNumber !== '') {
+          this.check1 = 1
+        } else {
+          this.check1 = 0
+        }
+        if (this.groupNumber !== '') {
+          this.check2 = 1
+        } else {
+          this.check2 = 0
+        }
+        if (this.year !== null && this.year !== '') {
+          this.check3 = 1
+        } else {
+          this.check3 = 0
+        }
+        if (this.month !== null && this.month !== '') {
+          this.check4 = 1
+        } else {
+          this.check4 = 0
+        }
+        if (this.time !== '' && this.time !== null) {
+          this.check5 = 1
+        } else {
+          this.check5 = 0
+        }
+        searchPurchaseTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent4, this.pageSize4).then(response => {
+          console.log(response)
+          this.tableDataPurchase = response.data.rows
+          this.listLoading1 = false
+          this.total4 = parseInt(response.data.total)
+        })
+      } else {
+        this.loading = false
+        this.$message.warning('请先选择项目')
+      }
+    },
+    handleSizeChange5(val) {
+      this.pageCurrent5 = 1
+      this.pageSize5 = val
+      if (this.entryNameValue !== null && this.entryNameValue !== '') {
+        if (this.entryNameValue !== null && this.entryNameValue !== '') {
+          this.check = 1
+        } else {
+          this.check = 0
+        }
+        if (this.machineToolNumber !== '') {
+          this.check1 = 1
+        } else {
+          this.check1 = 0
+        }
+        if (this.groupNumber !== '') {
+          this.check2 = 1
+        } else {
+          this.check2 = 0
+        }
+        if (this.year !== null && this.year !== '') {
+          this.check3 = 1
+        } else {
+          this.check3 = 0
+        }
+        if (this.month !== null && this.month !== '') {
+          this.check4 = 1
+        } else {
+          this.check4 = 0
+        }
+        if (this.time !== '' && this.time !== null) {
+          this.check5 = 1
+        } else {
+          this.check5 = 0
+        }
+        searchTable1(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent5, this.pageSize5).then(response => {
+          console.log(response)
+          this.tableData1 = response.data.rows
+          this.listLoading2 = false
+          this.total5 = parseInt(response.data.total)
+        })
+      } else {
+        this.loading = false
+        this.$message.warning('请先选择项目')
+      }
+    },
+    handleCurrentChange5(val) {
+      this.pageCurrent5 = val
+      if (this.entryNameValue !== null && this.entryNameValue !== '') {
+        if (this.entryNameValue !== null && this.entryNameValue !== '') {
+          this.check = 1
+        } else {
+          this.check = 0
+        }
+        if (this.machineToolNumber !== '') {
+          this.check1 = 1
+        } else {
+          this.check1 = 0
+        }
+        if (this.groupNumber !== '') {
+          this.check2 = 1
+        } else {
+          this.check2 = 0
+        }
+        if (this.year !== null && this.year !== '') {
+          this.check3 = 1
+        } else {
+          this.check3 = 0
+        }
+        if (this.month !== null && this.month !== '') {
+          this.check4 = 1
+        } else {
+          this.check4 = 0
+        }
+        if (this.time !== '' && this.time !== null) {
+          this.check5 = 1
+        } else {
+          this.check5 = 0
+        }
+        searchTable1(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent5, this.pageSize5).then(response => {
+          console.log(response)
+          this.tableData1 = response.data.rows
+          this.listLoading2 = false
+          this.total5 = parseInt(response.data.total)
+        })
+      } else {
+        this.loading = false
+        this.$message.warning('请先选择项目')
+      }
     }
   }
 }

src/views/PurchasingCenter/ReceiptConnectionSheet/index.vue

@@ -19,7 +19,7 @@
       <span>传送人:</span>
       <el-select v-model="transmitValue" placeholder="传送人" size="small" filterable clearable style="width:100px">
         <el-option
-          v-for="item in selectPerson"
+          v-for="item in sender"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
@@ -27,7 +27,7 @@
       <span>接收人:</span>
       <el-select v-model="recipientValue" placeholder="接收人" size="small" filterable clearable style="width:100px">
         <el-option
-          v-for="item in selectPerson"
+          v-for="item in receiver"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
@@ -61,7 +61,7 @@
         </el-table-column>
         <el-table-column align="center" label="开票时间" min-width="100px">
           <template slot-scope="scope">
-            {{ scope.row.开票时间 }}
+            {{ scope.row.开票时间 ? scope.row.开票时间 : '—' }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="开票金额" min-width="100px">
@@ -96,12 +96,12 @@
         </el-table-column>
         <el-table-column align="center" label="接收人" min-width="80px">
           <template slot-scope="scope">
-            {{ scope.row.接收人姓名==='请选择' ? '' : scope.row.接收人姓名 }}
+            {{ scope.row.接收人姓名==='请选择' ? '—' : scope.row.接收人姓名 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="备注" min-width="200px">
           <template slot-scope="scope">
-            {{ scope.row.备注 }}
+            {{ scope.row.备注 ? scope.row.备注 : '—' }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="操作" fixed="right" width="200px">
@@ -158,7 +158,7 @@
         <el-form-item label="传送人" prop="sendPerson">
           <el-select v-model="form1.sendPersonValue" placeholder="传送人" size="small" disabled filterable clearable style="width:100px">
             <el-option
-              v-for="item in selectPerson"
+              v-for="item in sender"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
@@ -167,7 +167,7 @@
         <el-form-item label="接收人" prop="receivePerson">
           <el-select v-model="form1.receivePersonValue" placeholder="接收人" size="small" filterable clearable style="width:100px">
             <el-option
-              v-for="item in selectPerson"
+              v-for="item in receiver"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
@@ -187,7 +187,7 @@
 </template>
 
 <script>
-import { searchInvoice, addInvoice, editInvoice, deleteInvoice, initPerson, initContract } from '@/api/PurchasingCenter/ReceiptConnectionSheet'
+import { searchInvoice, addInvoice, editInvoice, deleteInvoice, initSender, initReceiver, initContract } from '@/api/PurchasingCenter/ReceiptConnectionSheet'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -199,7 +199,8 @@ export default {
       invoiceNum: '',
       invoiceTime: '',
       transmitValue: '',
-      selectPerson: [], // 传送人接收人
+      sender: [], // 传送人
+      receiver: [], // 接收人
       recipientValue: '',
       contractNum: '',
       pageCurrent1: 1,
@@ -255,9 +256,17 @@ export default {
           })
         }
       })
-      initPerson().then(response => {
+      initSender().then(response => { // 传送人
         for (let i = 0; i < response.data.length; i++) {
-          this.selectPerson.push({
+          this.sender.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
+      initReceiver().then(response => { // 接收人
+        for (let i = 0; i < response.data.length; i++) {
+          this.receiver.push({
             label: response.data[i].姓名,
             value: response.data[i].人员编号
           })

src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue

@@ -490,6 +490,9 @@ export default {
   methods: {
     searchData() {
       searchData(this.contractNumValue).then(response => {
+        for (let j = 0; j < response.data.length; j++) {
+          response.data[j].物料计划到货时间 = (response.data[j].物料计划到货时间).split(' ')[0]
+        }
         this.tableData3 = response.data
         for (let i = 0; i < response.data.length; i++) {
           this.deliveryDay[i] = 0