lx

src/views/Inventory/DirectPart/index.vue

@@ -268,9 +268,8 @@ export default {
       this.PeopleNumber = this.id
     },
     searchMachine() { // 查询机床
-      if (this.ProjectValue === '') {
-        this.ProjectValue_check = 0
-      }
+      this.Machine = []
+      this.ProjectValue ? this.ProjectValue_check = 1 : this.ProjectValue_check = 0
       searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.Machine.push({
@@ -281,6 +280,7 @@ export default {
       })
     },
     searchGroupList() { // 查询组号
+      this.GroupNum = []
       searchTeam(this.MachineValue).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.GroupNum.push({
@@ -291,16 +291,19 @@ export default {
       })
     },
     searchPeopleData() { // 查询人员
+      this.People = []
       searchPeople().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.People.push({
             label: response.data[i].姓名,
-            value: response.data[i].考勤编号
+            value: parseInt(response.data[i].考勤编号)
           })
         }
+        console.log(this.People)
       })
     },
     searchContractData() { // 查询合同
+      this.Contract = []
       searchContract().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.Contract.push({
@@ -312,18 +315,10 @@ export default {
     },
     searchPartinfo() {
       this.tableDataPurchase = []
-      if (this.ProjectValue === '') {
-        this.ProjectValue_check = 0
-      }
-      if (this.MachineValue === '') {
-        this.MachineValue_check = 0
-      }
-      if (this.GroupNumValue === '') {
-        this.GroupNumValue_check = 0
-      }
-      if (this.ContractValue === '') {
-        this.ContractValue_check = 0
-      }
+      this.ProjectValue ? this.ProjectValue_check = 1 : this.ProjectValue_check = 0
+      this.MachineValue ? this.MachineValue_check = 1 : this.MachineValue_check = 0
+      this.GroupNumValue ? this.GroupNumValue_check = 1 : this.GroupNumValue_check = 0
+      this.ContractValue ? this.ContractValue_check = 1 : this.ContractValue_check = 0
       this.listLoading = true
       searchDirectPart(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue, this.ContractValue_check, this.ContractValue).then(response => {
         this.tableDataPurchase = response.data.rows
@@ -349,8 +344,7 @@ export default {
     // 打开直达件表单
     addDirect(row) {
       this.PeopleValue = ''
-      this.form = []
-      console.log(row)
+      this.form = {}
       this.dialogFormVisible = true
       this.materialNum = row.物料流水号
       this.purchaseContractNumber = row.采购合同明细流水号
@@ -367,7 +361,7 @@ export default {
       this.dialogFormVisible1 = true
       this.directPartNumber = row.直达件流水号
       this.form.DirectNumber = row.到货数量
-      this.PeopleValue = row.领用人员流水号
+      this.PeopleValue = parseInt(row.领用人员流水号)
       this.form.DirectNote = row.备注
     },
     // 修改直达件

src/views/Inventory/InventoryCheck/index.vue

@@ -111,7 +111,7 @@
             </el-table-column>
             <el-table-column label="入库时间" align="center" min-width="80">
               <template slot-scope="scope">
-                {{ scope.row.入库时间 }}
+                {{ scope.row.入库时间 ? scope.row.入库时间.split(' ')[0] : '' }}
               </template>
             </el-table-column>
           </el-table>
@@ -261,7 +261,7 @@
             </el-table-column>
             <el-table-column label="到货时间" align="center" min-width="80">
               <template slot-scope="scope">
-                {{ scope.row.到货时间 }}
+                {{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
               </template>
             </el-table-column>
           </el-table>
@@ -404,7 +404,7 @@
             </el-table-column>
             <el-table-column label="到货时间" align="center" min-width="80">
               <template slot-scope="scope">
-                {{ scope.row.到货时间 }}
+                {{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
               </template>
             </el-table-column>
           </el-table>
@@ -562,7 +562,7 @@
             </el-table-column>
             <el-table-column label="到货时间" align="center" min-width="80">
               <template slot-scope="scope">
-                {{ scope.row.到货时间 }}
+                {{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
               </template>
             </el-table-column>
           </el-table>

src/views/Inventory/SubPartCome/index.vue

@@ -3,8 +3,8 @@
     <el-card>
       <span style="margin: 5px">替换单编号</span>
       <el-input v-model="substituteNumber" clearable size="small" style="width:200px" />
-      <span style="margin: 5px">零件图号</span>
-      <el-input v-model="partNumber" clearable size="small" style="width:200px" />
+      <span style="margin: 5px">替换件名称</span>
+      <el-input v-model="subPartName" clearable size="small" style="width:200px" />
       <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="getSubstitutedCard()">查询</el-button>
     </el-card>
     <el-card>
@@ -65,8 +65,10 @@ export default {
   data() {
     return {
       tableDataExchange: [],
-      substituteNumber: '',
-      partNumber: '',
+      check1: 0,
+      check2: 0,
+      substituteNumber: '', // 替换单编号
+      subPartName: '', // 替换件名称
       listLoading: '',
       subList: '',
       locateNumber: '',
@@ -77,7 +79,9 @@ export default {
     // 替换单查询
     getSubstitutedCard() {
       this.listloading = true
-      searchSubstitutedCard().then(response => {
+      this.substituteNumber ? this.check1 = 1 : this.check1 = 0
+      this.subPartName ? this.check2 = 1 : this.check2 = 0
+      searchSubstitutedCard(this.check1, this.substituteNumber, this.check2, this.subPartName).then(response => {
         this.tableDataExchange = response.data
         this.listloading = false
       })