更新

src/api/WorkshopProcurement/AccountingPrice.js

@@ -7,19 +7,19 @@ export function initPayState() {
     method: 'post',
     data: {
       type: '1',
-      name: '车间管理_基本件外购质检_合同查询'
+      name: '车间采购管理_采购合同_查询'
     }
   })
 }
 // 查询表1
-export function searchParts(pageCurrent, pageSize, check1, num, check2, name) {
+export function searchParts(pageCurrent, pageSize, check1, num) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间管理_核算价格_查询数据',
-      param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`,
+      param: `采购合同流水号_check=${check1}&采购合同流水号=${num}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/WorkshopProcurement/ProcurementContractApproval.js

@@ -7,7 +7,7 @@ export function initContract() {
     method: 'post',
     data: {
       type: '1',
-      name: '车间采购管理_采购合同_查询_cjn'
+      name: '车间采购管理_采购合同_未审批查询'
     }
   })
 }

src/api/WorkshopProcurement/PurchaseContractChange.js

@@ -7,7 +7,7 @@ export function initContract() {
     method: 'post',
     data: {
       type: '1',
-      name: '车间采购管理_采购合同_查询_cjn'
+      name: '车间采购管理_采购合同_查询'
     }
   })
 }

src/api/WorkshopProcurement/PurchasingQualityInspection.js

@@ -7,7 +7,7 @@ export function initPayState() {
     method: 'post',
     data: {
       type: '1',
-      name: '车间管理_基本件外购质检_合同查询'
+      name: '车间采购管理_采购合同_查询'
     }
   })
 }

src/api/WorkshopProcurement/QualityInspectionQuery.js

@@ -7,30 +7,19 @@ export function initPayState() {
     method: 'post',
     data: {
       type: '1',
-      name: '车间管理_基本件外购质检_合同查询'
+      name: '车间采购管理_采购合同_查询'
-    }
-  })
-}
-// 初始化零件
-export function initParts() {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间管理_基本件外购质检_零件查询'
     }
   })
 }
 // 查询表1
-export function searchParts(pageCurrent, pageSize, check1, num, check2, name, check3, num1) {
+export function searchParts(pageCurrent, pageSize, check1, num, check2, name) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间管理_质检情况_查询数据',
-      param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}&物料流水号_check=${check3}&物料流水号=${num1}`,
+      param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/views/TechnologyCenter/CreatePackingList/index.vue

@@ -606,7 +606,6 @@ export default {
         console.log(resp)
         const groupData = resp.data.map(item => {
           item.类别 = '机床所属部件'
-          item.代号 = data[i].代号 + '-' + item.代号 + '组'
           return item
         })
         console.log(groupData)

src/views/TechnologyCenter/ImportParts/index.vue

@@ -168,6 +168,7 @@ export default {
             this.disabled = false
             return
           } else {
+            console.log(this.worksheet[j], 111111111)
             if (this.worksheet[j].M2.v.substring(0, 1) !== '9') {
               this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = ''
               this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = ''

src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue

@@ -543,6 +543,11 @@ export default {
       this.fax ? this.supplierCheck11 = 1 : (this.supplierCheck11 = 0, this.fax = '')
       this.goodTime ? this.supplierCheck12 = 1 : (this.supplierCheck12 = 0, this.goodTime = '')
       searchSupplier(this.supplierCheck1, this.supplierName, this.supplierCheck2, this.enterpriseNature, this.supplierCheck3, this.createDate, this.supplierCheck4, this.registeredCapital, this.supplierCheck5, this.taxNum, this.supplierCheck6, this.EMail, this.supplierCheck7, this.address, this.supplierCheck8, this.account, this.supplierCheck9, this.openingBank, this.supplierCheck10, this.phone, this.supplierCheck11, this.fax, this.supplierCheck12, this.goodTime).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          if (response.data[i].创立日期 !== '' && response.data[i].创立日期 !== null) {
+            response.data[i].创立日期 = response.data[i].创立日期.split(' ')[0]
+          }
+        }
         this.tableData01 = response.data
       })
     },

src/views/WorkshopProcurement/QualityInspectionQuery/index.vue

@@ -15,14 +15,6 @@
         </el-select>
         <span>供应商:</span>
         <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width: 200px"/>
-        <span>零件名称:</span>
-        <el-select v-model="PartNumberValue" placeholder="零件名称" size="small" filterable clearable>
-          <el-option
-            v-for="item in PartNumber"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total=0;pageCurrent=1;pageSize=10;searchTable()">查询</el-button>
       </el-row>
     </el-card>
@@ -102,7 +94,7 @@
 </template>
 
 <script>
-import { initPayState, initParts, searchParts } from '@/api/WorkshopProcurement/QualityInspectionQuery'
+import { initPayState, searchParts } from '@/api/WorkshopProcurement/QualityInspectionQuery'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -115,8 +107,6 @@ export default {
       contractNumValue: '',
       contractNum: [],
       supplierName: '',
-      PartNumberValue: '',
-      PartNumber: [],
       tableData: [],
       pageSize: 10,
       pageCurrent: 1,
@@ -145,21 +135,12 @@ export default {
           })
         }
       })
-      initParts().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.PartNumber.push({
-            label: response.data[i].物料名称,
-            value: response.data[i].物料流水号
-          })
-        }
-      })
     },
     searchTable() {
       this.loading = true
       this.contractNumValue ? this.check1 = 1 : this.check1 = 0
       this.supplierName ? this.check2 = 1 : this.check2 = 0
-      this.PartNumberValue ? this.check3 = 1 : this.check3 = 0
+      searchParts(this.pageCurrent, this.pageSize, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => {
-      searchParts(this.pageCurrent, this.pageSize, this.check1, this.contractNumValue, this.check2, this.supplierName, this.check3, this.PartNumberValue).then(response => {
         this.loading = false
         for (let i = 0; i < response.data.rows.length; i++) {
           if (response.data.rows[i].交检日期 !== '') {