更新

src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js

@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+import state from '@/store'
+import router from '@/router'
+
+// 查询供应商
+export function searchSupplier() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '采购管理_供应商_查询数据_根据条件'
+    }
+  })
+}
+// 根据条件查发票结算申请单
+export function searchTable1(...group) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间采购管理_发票结算申请单_查询数据',
+      param: `发票号_check=${group[0]}&发票号=${group[1]}`,
+      Pagination: group[2] + '&' + group[3]
+    }
+  })
+}

src/api/WorkshopProcurement/PurchaseSituationSearchMetalworking.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+import state from '@/store'
+import router from '@/router'
+
+// 初始化合同
+export function searchdata(check1, partDrawing, check2, daterange0, daterange1, partName, order, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间管理_车间采购_采购件查询',
+      param: `零件图号_check=${check1}&零件图号=${partDrawing}&时间段_check=${check2}&开始时间=${daterange0}&结束时间=${daterange1}&排序名称=${partName}&排序方式=${order}`,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}

src/views/Inventory/MaterialReturn/index.vue

@@ -96,7 +96,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
-            <el-button type="text" size="mini" icon="el-icon-right" @click="yesApproval(scope.row)">退货</el-button>
+            <el-button :disabled="Number(scope.row.退料数量) >= Number(scope.row.出库数量)" type="text" size="mini" icon="el-icon-right" @click="yesApproval(scope.row)">退货</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -114,6 +114,20 @@
     </el-card>
     <el-dialog :visible.sync="dialogFormVisible" title="补投" center width="300px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="80px" class="demo-ruleForm">
+        <div>
+          <ei-row>
+            <span>{{ nameOrNumber }}</span>
+          </ei-row>
+          <el-row>
+            <span>出库数量:{{ outNumber }}</span>
+          </el-row>
+          <el-row>
+            <span>领料人:{{ people }}</span>
+          </el-row>
+          <el-row>
+            <span>出库时间:{{ time }}</span>
+          </el-row>
+        </div>
         <el-form-item label="退料数量" prop="退料数量">
           <el-input-number v-model="form.退料数量" :min="1" :max="outNumber" :step="1" style="width: 140px" size="small" />
         </el-form-item>
@@ -164,6 +178,10 @@ export default {
       model: '',
       typeNumber: '',
       floatNumber: '',
+      time: '',
+      nameOrNumber: '',
+      people: '',
+      number: '',
       locateName: [],
       tableData: [],
       pageSize1: 100,
@@ -246,19 +264,28 @@ export default {
       this.materialNumber = row.物料流水号
       this.basicNumber = row.组件零件基本件流水号
       this.outNumber = Number(row.出库数量)
+      this.nameOrNumber = row.名称 + ' ' + row.图号或型号
       this.typeNumber = row.退料类型
       this.floatNumber = row.零件流水号
+      this.time = row.出库时间 ? row.出库时间.split(' ')[0] : ''
+      this.people = row.领料人
     },
     submit() {
-      submitMaterialReturn(this.materialNumber, this.basicNumber, this.form.退料数量, this.form.货位名称, this.id, this.typeNumber, this.floatNumber).then(response => {
+      this.$refs['form'].validate((valid) => {
-        if (response.data[0].result === '1') {
+        if (valid) {
-          this.$message.success('退料成功')
+          submitMaterialReturn(this.materialNumber, this.basicNumber, this.form.退料数量, this.form.货位名称, this.id, this.typeNumber, this.floatNumber).then(response => {
-          this.dialogFormVisible = false
+            if (response.data[0].result === '1') {
-          this.searchRecord()
+              this.$message.success('退料成功')
-          this.handleEdit_disable = false
+              this.dialogFormVisible = false
+              this.searchRecord()
+              this.handleEdit_disable = false
+            } else {
+              this.handleEdit_disable = false
+              this.$message.error('退料失败')
+            }
+          })
         } else {
-          this.handleEdit_disable = false
+          return false
-          this.$message.error('退料失败')
         }
       })
     },

src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue

@@ -41,7 +41,7 @@
             end-placeholder="结束日期"/>
           <el-button type="primary" size="small" style="margin: 0px 5px" icon="el-icon-search" plain @click="pageCurrent=1;pageSize=300;total=0;searchData()">查询</el-button>
           <el-tooltip effect="dark" content="将零件打回，重新编制工艺定额" placement="top">
-            <el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 0px" icon="el-icon-back" size="small" @click="returnEdit">打回重新编制</el-button>
+            <el-button v-show="true" :disabled="jinyong1" type="danger" plain style="margin-left: 0px;margin-top: 0px" icon="el-icon-back" size="small" @click="returnEdit">打回重新编制</el-button>
           </el-tooltip>
           <el-button :disabled="jinyong" type="primary" size="small" plain style="float: right; margin: 0px 20px 0px 0px" @click="tiaozheng()">工艺员调整</el-button>
           <el-select v-model="PersonValue1" style="width:100px;float: right;" placeholder="人员" size="small" filterable clearable>
@@ -175,7 +175,7 @@
               <td class="tg-c3ow">{{ value.准结定额工时 }}</td>
               <td class="tg-c3ow"/>
               <td class="tg-c3ow">{{ value.计划日期 }}</td>
-              <td class="tg-c3ow">{{ value.工序流水号 }}</td>
+              <td class="tg-c3ow">2{{ value.工序流水号 }}</td>
             </tr>
             <tr>
               <td class="tg-c3ow">工艺员</td>
@@ -184,10 +184,10 @@
               <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].定额员 : '' }}</td>
               <td class="tg-c3ow">工艺完成</td>
               <td class="tg-c3ow">{{ tableData2[0].工艺实际完成时间 ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }}</td>
-              <td class="tg-c3ow">加工开始</td>
+              <td class="tg-c3ow">计划开始</td>
-              <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工开始时间 : '' }}</td>
+              <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工开始时间.split(' ')[0] : '' }}</td>
-              <td class="tg-c3ow">加工结束</td>
+              <td class="tg-c3ow">计划结束</td>
-              <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工结束时间 : '' }}</td>
+              <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工结束时间.split(' ')[0] : '' }}</td>
             </tr>
           </table>
         </el-card>
@@ -232,7 +232,8 @@ export default {
       日期: '',
       PersonValue1: '',
       Person1: [],
-      jinyong: false
+      jinyong: false,
+      jinyong1: false
     }
   },
   created() {
@@ -351,12 +352,16 @@ export default {
     },
     handleSelectionChange(val) {
       this.jinyong = false
+      this.jinyong1 = false
       this.partNumValue = []
       for (let i = 0; i < val.length; i++) {
         this.partNumValue.push(val[i].工艺计划流水号)
-        if (val[i].工艺任务分配状态 === 1) {
+        if (val[i].进程 !== '编制中') {
           this.jinyong = true
         }
+        if (val[i].进程 === '编制中') {
+          this.jinyong1 = true
+        }
       }
     },
     handleSizeChange(val) {

src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue

@@ -126,9 +126,14 @@
             {{ scope.row.报废时间 ? scope.row.报废时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
+        <el-table-column label="提交人" align="center" width="90px">
+          <template slot-scope="scope">
+            {{ scope.row.报废人 }}
+          </template>
+        </el-table-column>
         <el-table-column label="补投数" align="center" width="90px">
           <template slot-scope="scope">
-            {{ scope.row.补投数量 }}
+            {{ scope.row.补投数量 !== 0 || scope.row.补投数量 ? scope.row.补投数量 : '' }}
           </template>
         </el-table-column>
         <el-table-column label="补投时间" align="center" width="90">
@@ -136,6 +141,11 @@
             {{ scope.row.补投时间 ? scope.row.补投时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
+        <el-table-column label="补投人" align="center" width="90px">
+          <template slot-scope="scope">
+            {{ scope.row.补投人 }}
+          </template>
+        </el-table-column>
         <el-table-column label="质检备注" align="center" width="120px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.备注 }}
@@ -300,7 +310,7 @@ export default {
       })
     },
     selectable(row) {
-      return row.报废时间 === null
+      return (row.报废时间 === null && row.不合格处理文本 === '报废')
     },
     handleSelectionChange(val) {
       this.procedureGroup = val

src/views/Outsourcing/OutsourcingTaskExecution/index.vue

@@ -74,10 +74,10 @@
       </el-col>
       <el-col :span="15" style="float: right">
         <div>
-          <el-button type="warning" size="mini" icon="el-icon-arrow-down" style="margin-top:3px" plain @click="getSpareParts">选入零件</el-button>
+          <el-button :disabled="jinyong" type="warning" size="mini" icon="el-icon-arrow-down" style="margin-top:3px" plain @click="getSpareParts">选入零件</el-button>
           <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('RWD')">导出任务单</el-button>
           <el-tooltip :open-delay="1200" effect="dark" content="成交" placement="top">
-            <el-button type="success" size="mini" icon="el-icon-upload2" style="margin-left:10px;margin-top: 3px;float: right" plain @click="Deal">提交</el-button>
+            <el-button :disabled="jinyong" type="success" size="mini" icon="el-icon-upload2" style="margin-left:10px;margin-top: 3px;float: right" plain @click="Deal">提交</el-button>
           </el-tooltip>
           <!--<el-tooltip :open-delay="1200" effect="dark" content="核对价格信息后确定" placement="top">-->
           <!--<el-button type="success" size="mini" icon="el-icon-tickets" style="margin-left:10px;margin-top: 3px;float: right" plain @click="confirmPrice">保存</el-button>-->
@@ -116,7 +116,7 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="80px">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-right" @click="handleDelete1(scope.row)">移出</el-button>
+              <el-button :disabled="jinyong" size="mini" type="text" icon="el-icon-right" @click="handleDelete1(scope.row)">移出</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -263,6 +263,7 @@ export default {
         children: 'children',
         label: 'label'
       },
+      jinyong: '',
       process: [[]],
       returns: [],
       零件图号: [],
@@ -373,6 +374,7 @@ export default {
     },
     // 点击表2 查询表3
     searchProcess(row) {
+      row.单据状态 === '成交' ? this.jinyong = true : this.jinyong = false
       this.loading = true
       this.List3 = []
       this.Number = row.外协加工任务单流水号
@@ -554,6 +556,7 @@ export default {
                   外协加工任务单明细流水号: response.data[i].外协加工任务单明细流水号,
                   加工价格_成交: response.data[i].加工价格_成交.toFixed(2),
                   机加工开始时间: response.data[i].机加工开始时间 ? response.data[i].机加工开始时间.split(' ')[0] : '',
+                  到货日期: response.data[i].到货日期,
                   零件图号: response.data[i].零件图号,
                   零件名称: response.data[i].零件名称,
                   批次数量: response.data[i].批次数量,
@@ -591,6 +594,7 @@ export default {
                   外协加工任务单明细流水号: response.data[i].外协加工任务单明细流水号,
                   加工价格_成交: response.data[i].加工价格_成交.toFixed(2),
                   机加工开始时间: response.data[i].机加工开始时间 ? response.data[i].机加工开始时间.split(' ')[0] : '',
+                  到货日期: response.data[i].到货日期,
                   零件图号: response.data[i].零件图号,
                   零件名称: response.data[i].零件名称,
                   批次数量: response.data[i].批次数量,
@@ -670,6 +674,7 @@ export default {
                     外协加工任务单明细流水号: response.data[i].外协加工任务单明细流水号,
                     加工价格_成交: response.data[i].加工价格_成交.toFixed(2),
                     机加工开始时间: response.data[i].机加工开始时间 ? response.data[i].机加工开始时间.split(' ')[0] : '',
+                    到货日期: response.data[i].到货日期,
                     零件图号: response.data[i].零件图号,
                     零件名称: response.data[i].零件名称,
                     批次数量: response.data[i].批次数量,

src/views/PurchasingCenter/OfflineContract/index.vue

@@ -322,9 +322,9 @@
               {{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
             </template>
           </el-table-column>
-          <el-table-column label="采购数" align="center" width="100">
+          <el-table-column label="采购数" align="center" width="120">
             <template slot-scope="scope">
-              <el-input v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:60px" @change="saveContract()"/>
+              <el-input v-positive="'float'" v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:100px" type="number" @change="saveContract()"/>
               <b v-else>{{ scope.row.数量 }}</b>
             </template>
           </el-table-column>
@@ -344,9 +344,20 @@
               <b v-show="hasTax!=='未税'">{{ (scope.row.单价 / (1 + taxRate)).toFixed(2) }}</b>
             </template>
           </el-table-column>
-          <el-table-column label="单价(含税)元" align="center" width="120" prop="单价">
+          <el-table-column label="单价(含税)元" align="center" width="120" prop="单价(含税)">
             <template slot-scope="scope">
-              <el-input v-direction="{x: 1, y: scope.$index}" v-if="hasTax==='含税'" v-model="scope.row.单价" :disabled="disable" size="mini" style="width:80px" @change="saveContract()"/>
+              <el-input
+                v-positive="'float'"
+                v-direction="{x: 1, y: scope.$index}"
+                v-if="hasTax==='含税'"
+                v-model="scope.row.单价"
+                :disabled="disable"
+                class="editWorkTime"
+                size="mini"
+                style="width:100px"
+                type="number"
+                @blur="changefixed(scope.row.单价, scope.$index, '单价')"
+                @change="saveContract()"/>
               <b v-show="hasTax!=='含税'">{{ (scope.row.未税单价 * (1 + taxRate)).toFixed(2) }}</b>
             </template>
           </el-table-column>
@@ -844,6 +855,23 @@ export default {
     this.initDirection()
   },
   methods: {
+    changefixed(val, index, date) {
+      console.log(index, 6666)
+      let value = '' + val
+      value = value
+        .replace(/[^\d.]/g, '') // 清除“数字”和“.”以外的字符
+        .replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的
+        .replace('.', '$#$')
+        .replace(/\./g, '')
+        .replace('$#$', '.')
+        .replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数
+      if (value.indexOf('.') < 0 && value !== '') {
+        value = parseFloat(value).toFixed(2)
+      }
+      console.log(value, this.tableData3[index][date])
+      this.tableData3[index][date] = value
+      console.log(this.tableData3[index][date], 'this.tableData3[index][date]')
+    },
     handleSelection(val, row) {
       console.log(row, 123)
       this.tableData00.forEach((item, i) => {
@@ -1294,13 +1322,14 @@ export default {
       this.离线合同状态 = row.离线合同状态
       this.loading4 = true
       searchMateriel(this.offlineContractNum).then(response => {
-        console.log(response.data)
+        console.log(response, 'response')
         this.tableData3 = response.data
         this.tableData3.map(v => {
           this.$set(v, '未税总额', 0)
           this.$set(v, '含税总额', 0)
-          !v.单价 ? v.单价 = v.参考价格 : v.单价
+          this.$set(v, '单价', (v.单价).toFixed(2))
-          this.$set(v, '未税单价', v.单价 / (1 + this.taxRate))
+          !v.单价 ? v.单价 = parseFloat(v.参考价格).toFixed(2) : parseFloat(v.单价).toFixed(2)
+          this.$set(v, '未税单价', (v.单价 / (1 + this.taxRate)).toFixed(2))
         })
         console.log(this.tableData3, 'tableData31')
         this.loading4 = false
@@ -1372,7 +1401,7 @@ export default {
                 this.$set(v, '未税总额', 0)
                 this.$set(v, '含税总额', 0)
                 !v.单价 ? v.单价 = v.参考价格 : v.单价
-                this.$set(v, '未税单价', v.单价 / (1 + this.taxRate))
+                this.$set(v, '未税单价', (v.单价 / (1 + this.taxRate)).toFixed(2))
               })
             })
           } else { this.$message.error('选入失败') }
@@ -1395,7 +1424,7 @@ export default {
                 this.$set(v, '未税总额', 0)
                 this.$set(v, '含税总额', 0)
                 !v.单价 ? v.单价 = v.参考价格 : v.单价
-                this.$set(v, '未税单价', v.单价 / (1 + this.taxRate))
+                this.$set(v, '未税单价', (v.单价 / (1 + this.taxRate)).toFixed(2))
               })
             })
             if (this.tabName === '外购件' || this.tabName === '标准件') {
@@ -1768,6 +1797,13 @@ export default {
     width:150px;
     margin-right: 10px;
   }
+  .editWorkTime input::-webkit-outer-spin-button, input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    text-align: center;
+  }
+  .editWorkTime input[type="number"]{
+    -moz-appearance: textfield;
+  }
 </style>
 <style>
   .el-table .MistyRose {

src/views/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking/index.vue

@@ -0,0 +1,173 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <!--      <span>发票号:</span>-->
+      <el-input v-model="invoiceNum" placeholder="到票号\供应商" size="small" clearable/>
+      <el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+    </el-card>
+
+    <el-card>
+      <el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;" height="400px" size="mini" @row-click="searchTable2">
+        <el-table-column label="供应商" prop="供应商名称" align="center" width="200" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.供应商名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="到票号" prop="发票号" align="center" width="120">
+          <template slot-scope="scope">
+            {{ scope.row.发票号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="到票金额(元)" align="center" min-width="110">
+          <template slot-scope="scope">
+            {{ scope.row.发票金额 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="申请人" prop="申请人姓名" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" prop="操作时间" align="center" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="申请时间" prop="申请时间" align="center" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审批结果" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.审批4结果 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审批未过原因" align="center" width="110" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.审批4未过原因 ? scope.row.审批4未过原因 : '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审批时间" align="center" min-width="90" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.审批4时间 ? scope.row.审批4时间.split(' ')[0] : '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="财务" align="center" min-width="60">
+          <template slot-scope="scope">
+            {{ scope.row.审批3结果 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="财务未过原因" align="center" min-width="110" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.审批3未过原因 ? scope.row.审批3未过原因 : '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审批时间" align="center" min-width="90" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.审批3时间 ? scope.row.审批3时间.split(' ')[0] : '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" min-width="90" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.备注 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="pageCurrent1"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pageSize1"
+          :total="total1"
+          style="display:inline-block;width:50%"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange1"
+          @current-change="handleCurrentChange1"/>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { searchSupplier, searchTable1 } from '@/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: '', // 发票结算申请
+  data() {
+    return {
+      invoiceNum: '',
+      total1: 0,
+      pageCurrent1: 1,
+      pageSize1: 10,
+      tableData1: []
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'name',
+      'id' // 人员编号
+    ])
+  },
+  created() {
+    this.fetchData()
+    this.searchTable1()
+  },
+  methods: {
+    fetchData() {
+      this.supplier = []
+      searchSupplier().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.supplier.push({
+            label: response.data[i].供应商名称,
+            value: response.data[i].供应商流水号
+          })
+        }
+      })
+    },
+    searchTable1() {
+      this.disabled = true
+      let check1
+      this.invoiceNum ? check1 = 1 : check1 = 0
+      searchTable1(check1, this.invoiceNum, this.pageCurrent1, this.pageSize1).then(response => {
+        this.tableData1 = response.data.rows
+        this.tableData1.map(v => {
+          this.$set(v, 'scanSrc', '')
+          return v
+        })
+        for (let i = 0; i < response.data.rows.length; i++) {
+          this.tableData1[i].scanSrc = this.searchPic(response.data.rows[i], i)
+        }
+        this.total1 = response.data.total
+      })
+    },
+    handleSizeChange1(val) {
+      this.pageCurrent1 = 1
+      this.pageSize1 = val
+      this.searchTable1()
+    },
+    handleCurrentChange1(val) {
+      this.pageCurrent1 = val
+      this.searchTable1()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  span{
+    margin: 10px 0 10px 10px;
+  }
+  #expandTable .el-form-item{
+    margin: 0;
+  }
+</style>
+

src/views/WorkshopProcurement/PurchaseSituationSearchMetalworking/index.vue

@@ -0,0 +1,153 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-input v-model="partDrawing" placeholder="机床号零件名称图号或型号供应商" size="small" clearable style="width:250px;"/>
+      <el-date-picker
+        v-model="daterange"
+        size="small"
+        type="daterange"
+        align="center"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        range-separator="～"
+        style="width:250px;margin-left: 20px;"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
+      <el-button size="small" type="primary" icon="el-icon-search" style="margin-left: 20px" plain @click="pageCurrent=1;pageSize=50;searchTable()">查询</el-button>
+    </el-card>
+    <el-card>
+      <el-table :data="tableData" size="mini" style="max-height: 590px;width: 1370px" height="720px" border @sort-change="sortChange">
+        <el-table-column align="center" label="进程" width="80px" sortable="custom" prop="进程">
+          <template slot-scope="scope">
+            {{ scope.row.采购状态 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="采购合同编号" width="130px">
+          <template slot-scope="scope">
+            {{ scope.row.采购合同编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="机床图号" width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="组号" width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.组号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="零件名称" width="130px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.物料名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="图号或型号" width="150px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="材料或规格" width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.物料型号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="采购时间" width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.采购时间 ? scope.row.采购时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="采购人" width="90px">
+          <template slot-scope="scope">
+            {{ scope.row.采购员 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="采购数量" width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.零件数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="到货数量" width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.已到货数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="到货时间" width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="供应商" width="270px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.供应商名称 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          :current-page="pageCurrent"
+          :page-sizes="[50, 100, 200, 300]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { searchdata } from '@/api/WorkshopProcurement/PurchaseSituationSearchMetalworking'
+export default {
+  data() {
+    return {
+      partDrawing: '', // 零件图号
+      daterange: '', // 时间段
+      tableData: [],
+      total: 0, // 总条数
+      pageSize: 50, // 每页显示条数
+      pageCurrent: 1 // 后台获取页
+    }
+  },
+  methods: {
+    sortChange(column, prop, order) {
+      console.log(column.prop)
+      if (column.prop === '进程') {
+        this.partName = 1
+      } else {
+        this.partName = ''
+      }
+      if (column.order === 'ascending') {
+        this.order = 1
+      } else if (column.order === 'descending') { this.order = 2 } else {
+        this.order = ''
+      }
+      this.searchTable()
+    },
+    searchTable() {
+      let check1, check2
+      this.partDrawing ? check1 = 1 : check1 = 0
+      this.daterange ? check2 = 1 : (check2 = 0, this.daterange = '')
+      searchdata(check1, this.partDrawing, check2, this.daterange[0], this.daterange[1], this.partName, this.order, this.pageCurrent, this.pageSize).then(response => {
+        this.tableData = response.data.rows
+        this.total = response.data.total
+      })
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchTable()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchTable()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue

@@ -36,7 +36,7 @@
     </el-card>
     <el-card style="margin-top: 5px">
       <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row>
-        <el-table-column label="供应商" align="center" min-width="150">
+        <el-table-column label="供应商" align="center" min-width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -46,7 +46,7 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款金额(元)" align="center" min-width="60">
+        <el-table-column label="请款金额(元)" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.请款金额 }}
           </template>
@@ -71,16 +71,16 @@
         <!--{{ scope.row.审核情况内容 }}-->
         <!--</template>-->
         <!--</el-table-column>-->
-        <el-table-column label="审批时间" align="center" min-width="60">
-          <template slot-scope="scope">
-            {{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
-          </template>
-        </el-table-column>
         <el-table-column label="审批人" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.审批人 }}
           </template>
         </el-table-column>
+        <el-table-column label="审批时间" align="center" min-width="60">
+          <template slot-scope="scope">
+            {{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
         <el-table-column label="审批结果" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.审批情况内容 }}
@@ -101,7 +101,7 @@
             {{ scope.row.付款时间 ? scope.row.付款时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
-        <el-table-column label="付款情况内容" align="center" min-width="60">
+        <el-table-column label="付款情况" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.付款情况内容 }}
           </template>
@@ -226,6 +226,7 @@ export default {
     },
     searchTable2(row) { // 查看详情（请款信息包含的合同）
       this.gridData = []
+      this.dialogFormVisible = true
       searchRequsetFundDetail(row.采购合同请款流水号).then(response => {
         this.gridData = response.data
       })