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

src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js

@@ -27,8 +27,7 @@ export function searchTable(check, supplierNameValue, check1, partNumber, check2
       type: '1',
       name: '备料管理_外购备料_综合查询数据',
       param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue +
-      '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order,
+      '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
-      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }

src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue

@@ -232,9 +232,9 @@ export default {
         预留工时系数: ''
       },
       rules: {
-        设备名称: [{ required: true, message: '请选择设备名称', change: 'blur' }],
+        设备名称: [{ required: true, message: '请输入设备名称', change: 'blur' }],
-        设备编号: [{ required: true, message: '请选择设备编号', change: 'blur' }],
+        设备编号: [{ required: true, message: '请输入设备编号', change: 'blur' }],
-        设备型号: [{ required: true, message: '请选择设备型号', change: 'blur' }],
+        设备型号: [{ required: true, message: '请输入设备型号', change: 'blur' }],
         设备加工工艺: [{ required: true, message: '请选择设备加工工艺', trigger: 'blur' }]
         // 设备加工能力: [{ required: true, message: '请选择设备加工能力', change: 'blur' }],
         // 班次类型: [{ required: true, message: '请选择班次类型', trigger: 'blur' }],

src/views/Outsourcing/OutsourcingTaskExecution/index.vue

@@ -39,7 +39,7 @@
         <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="fetchData()">查询</el-button>
         <el-checkbox v-model="isChecked" size="small" label="历史"/>
         <el-button type="distribution" size="mini" plain icon="el-icon-circle-plus-outline" style="margin-left:1px" @click="handleAdd()">外协任务</el-button>
-        <el-table v-loading="loading2" :data="List" highlight-current-row height="550" size="mini" border @row-click="searchProcess" >
+        <el-table v-loading="loading2" :data="List" highlight-current-row height="488" size="mini" border @row-click="searchProcess" >
           <el-table-column label="表单号" prop="表单号" align="center" min-width="155px">
             <template slot-scope="scope">
               {{ scope.row.表单号 }}
@@ -65,9 +65,9 @@
           <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-tooltip>
-          <el-tooltip :open-delay="1200" effect="dark" content="核对价格信息后确定" placement="top">
+          <!--<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>
+          <!--<el-button type="success" size="mini" icon="el-icon-tickets" style="margin-left:10px;margin-top: 3px;float: right" plain @click="confirmPrice">保存</el-button>-->
-          </el-tooltip>
+          <!--</el-tooltip>-->
         </div>
         <el-table v-loading="loading" :data="List3" :summary-method="getSummaries" height="488" size="mini" show-summary border>
           <el-table-column label="零件图号" align="center" min-width="150px">
@@ -92,7 +92,7 @@
           </el-table-column>
           <el-table-column label="外协价格(元)" align="center" width="130px">
             <template slot-scope="scope">
-              <el-input v-positive="'float'" v-model="scope.row.加工价格_成交" class="editWorkTime" type="number" style="text-align: right" size="small"/>
+              <el-input v-positive="'float'" v-model="scope.row.加工价格_成交" class="editWorkTime" type="number" style="text-align: right" size="small" @change="saveAct(scope.row)"/>
             </template>
           </el-table-column>
           <el-table-column label="机加工开始时间" align="center" width="150px">
@@ -520,6 +520,9 @@ export default {
         this.$message.warning('请选择外协加工任务单')
       }
     },
+    saveAct(row) {
+      getPrice(row.外协加工任务单明细流水号, row.加工价格_成交)
+    },
     // 保存
     confirmPrice() {
       if (this.Number) {

src/views/PurchasingCenter/MaterialManagement/index.vue

@@ -138,14 +138,7 @@
     </el-card>
 
     <el-card>
-      <el-table
+      <el-table :data="tableData" style="width: 100%;margin-top: 3px" height="720" size="mini" highlight-current-row border stripe>
-        :data="tableData"
-        style="width: 100%;margin-top: 3px"
-        height="720"
-        size="mini"
-        highlight-current-row
-        border
-        stripe>
         <el-table-column align="center" label="物料名称" prop="物料名称">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
@@ -211,19 +204,9 @@
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="选择供货商" center width="400px">
       <el-input v-model="supplier1" placeholder="供货商" size="small" clearable style="width:200px"/>
-      <el-button
+      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px; margin-bottom: 10px" @click="pageCurrent1=1;searchSupplier()">查询
-        type="success"
-        icon="el-icon-search"
-        size="small"
-        style="margin-left: 15px; margin-bottom: 10px"
-        @click="pageCurrent1=1;searchSupplier()">查询
       </el-button>
-      <el-table
+      <el-table :data="tableData1" size="mini" highlight-current-row border @row-click="selectSupplier">
-        :data="tableData1"
-        size="mini"
-        highlight-current-row
-        border
-        @row-click="selectSupplier">
         <el-table-column align="center" label="供货商">
           <template slot-scope="scope">
             {{ scope.row.供货商 }}
@@ -251,13 +234,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="物料类别" prop="物料类别流水号">
-              <el-select
+              <el-select v-model="form.物料类别流水号" style="width:160px" placeholder="请选择" size="small" clearable @change="searchMaterialVariety1">
-                v-model="form.物料类别流水号"
-                style="width:160px"
-                placeholder="请选择"
-                size="small"
-                clearable
-                @change="searchMaterialVariety1">
                 <el-option
                   v-for="item in MaterialCategory1"
                   :key="item.value"
@@ -377,13 +354,7 @@
           <br>
         </el-card>
         <el-card>
-          <el-table
+          <el-table :data="tableData2" size="mini" height="328" highlight-current-row border @row-click="selectMaterialCategory">
-            :data="tableData2"
-            size="mini"
-            height="328"
-            highlight-current-row
-            border
-            @row-click="selectMaterialCategory">
             <el-table-column align="center" label="物料类别">
               <template slot-scope="scope">
                 {{ scope.row.物料类别 }}
@@ -427,13 +398,7 @@
           <el-button type="warning" plain size="mini" icon="el-icon-edit" @click="handleEdit2">编辑</el-button>
         </el-card>
         <el-card>
-          <el-table
+          <el-table :data="tableData3" size="mini" height="300" highlight-current-row border @row-click="selectMaterialVariety">
-            :data="tableData3"
-            size="mini"
-            height="300"
-            highlight-current-row
-            border
-            @row-click="selectMaterialVariety">
             <el-table-column align="center" label="品种编号">
               <template slot-scope="scope">
                 {{ scope.row.品种编号 }}
@@ -471,13 +436,9 @@
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="新增供应商" center style="min-height: 300px" width="350px">
       <el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" class="demo-ruleForm">
-        <el-row>
+        <el-form-item label="供货商名称" prop="供货商名称">
-          <el-col :span="12">
+          <el-input v-model="form3.供货商名称" placeholder="供货商名称" size="small" clearable style="width:150px"/>
-            <el-form-item label="供货商名称" prop="供货商名称">
+        </el-form-item>
-              <el-input v-model="form3.供货商名称" placeholder="供货商名称" size="small" clearable style="width:150px"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible3=false">取消</el-button>
@@ -487,14 +448,7 @@
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="采购部新增物料审核" center style="min-height: 300px" width="700px">
       <el-form>
-        <el-table
+        <el-table :data="tableData5" style="width: 100%;margin-top: 3px" height="300" size="mini" highlight-current-row border stripe>
-          :data="tableData5"
-          style="width: 100%;margin-top: 3px"
-          height="300"
-          size="mini"
-          highlight-current-row
-          border
-          stripe>
           <el-table-column align="center" label="物料名称">
             <template slot-scope="scope">
               {{ scope.row.物料名称 }}

src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue

@@ -35,27 +35,9 @@
       </div>
     </el-card>
     <el-card style="width: 100%">
-      <el-table
+      <el-table v-loading="loading" :data="tableData" highlight-current-row border stripe size="mini" style="width: 100%" height="750" @sort-change="sortChange">
-        v-loading="loading"
+        <el-table-column label="序号" align="center" type="index" width="50"/>
-        :data="tableData"
+        <el-table-column label="进程" align="center" prop="进程" sortable="custom" width="80px">
-        highlight-current-row
-        border
-        stripe
-        size="mini"
-        style="width: 100%"
-        height="750"
-        @sort-change="sortChange">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          width="50"/>
-        <el-table-column
-          label="进程"
-          align="center"
-          prop="进程"
-          sortable="custom"
-          width="80px">
           <template slot-scope="scope">
             <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到</span>
             <span v-if="Number(scope.row.是否到货)===1" type="primary" size="mini">已到</span>
@@ -200,8 +182,8 @@ export default {
     // this.getTableData()
   },
   methods: {
-    formatJson(filterVal, jsonData) {
+    formatJson(column, tableData) {
-      return jsonData.map(v => filterVal.map(j => {
+      return tableData.map(v => column.map(j => {
         return v[j]
       }))
     },
@@ -283,9 +265,8 @@ export default {
         check2 = 0
       }
       searchTable(check, this.supplierNameValue, check1, this.partNumber, check2, this.MaterialsValue, check3, this.dateRange[0], this.dateRange[1], this.ordername, this.order, this.pageSize, this.pageCurrent).then(response => {
-        console.log(response)
+        this.tableData = response.data.result
-        this.tableData = response.data.rows
+        this.total = parseInt(response.data.output[0].ItemCount)
-        this.total = response.data.total
         this.loading = false
       })
     },

src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue

@@ -43,6 +43,7 @@
             :row-key="getRowKeys"
             :expand-row-keys="expands"
             :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
+            :summary-method="getSummaries1"
             border
             stripe
             style="margin-top: 3px;"
@@ -271,6 +272,31 @@ export default {
       })
       return sums
     },
+    getSummaries1(param) { // 合计
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+        } else if (index === 3) {
+          const values = data.map(item => Number(parseFloat(item['请款金额'])))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] = sums[index].toFixed(2) + ' 元'
+          } else {
+            sums[index] = 'N/A'
+          }
+        }
+      })
+      return sums
+    },
     exportExcel() {
       this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
       this.supplierName0 ? this.check2 = 1 : (this.check2 = 0, this.supplierName0 = '')