rev:aps原料需求和采购订单功能修改

mes/qd/src/views/wms/pcs/purchaseplan/index.vue

@@ -9,17 +9,17 @@
           :inline="true"
           class="demo-form-inline"
           label-position="right"
-          label-width="80px"
           label-suffix=":"
+          label-width="80px"
         >
 
           <el-form-item label="车间">
             <el-select
               v-model="query.workshop_id"
-              clearable
-              size="mini"
-              placeholder="全部"
               class="filter-item"
+              clearable
+              placeholder="全部"
+              size="mini"
               @change="crud.toQuery"
             >
               <el-option
@@ -33,21 +33,21 @@
           <el-form-item label="需求日期">
             <el-date-picker
               v-model="query.createTime"
+              align="center"
+              end-placeholder="结束日期"
+              start-placeholder="开始日期"
               type="daterange"
               value-format="yyyy-MM-dd"
-              align="center"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
               @change="crud.toQuery"
             />
           </el-form-item>
           <el-form-item label="状态">
             <el-select
               v-model="query.bill_status"
-              clearable
-              size="mini"
-              placeholder="单据状态"
               class="filter-item"
+              clearable
+              placeholder="单据状态"
+              size="mini"
               @change="crud.toQuery"
             >
               <el-option
@@ -61,11 +61,11 @@
           <el-form-item label="生成方式">
             <el-select
               v-model="query.create_mode"
+              class="filter-item"
               clearable
               filterable
-              size="mini"
               placeholder="生成方式"
-              class="filter-item"
+              size="mini"
               @change="crud.toQuery"
             >
               <el-option
@@ -79,9 +79,9 @@
           <el-form-item label="物料">
             <el-input
               v-model="query.material_search"
-              size="mini"
               clearable
               placeholder="编码、名称"
+              size="mini"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
@@ -93,9 +93,9 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="success"
           icon="el-icon-upload2"
           size="mini"
+          type="success"
           @click="downdtl"
         >
           导出EXCEL
@@ -103,31 +103,31 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="success"
           icon="el-icon-download"
           size="mini"
+          type="success"
           @click="uploadShow = true"
         >
           导入EXCEL
         </el-button>
         <el-button
           slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-finished"
           :disabled="crud.selections.length !== 1"
+          class="filter-item"
+          icon="el-icon-finished"
           size="mini"
+          type="success"
           @click="crud.toEdit(crud.selections[0])"
         >
           确认采购
         </el-button>
         <el-button
           slot="right"
-          class="filter-item"
-          type="success"Ï
-          icon="el-icon-check"
           :disabled="crud.selections.length === 0"
+          class="filter-item" icon="el-icon-check"
           size="mini"
+          type="success"
+          Ï
           @click="confirm(crud.selections)"
         >
           强制完成
@@ -137,37 +137,38 @@
       <el-table
         ref="table"
         v-loading="crud.loading"
-        size="mini"
         :data="crud.data"
+        :row-class-name="tableRowClassName"
+        :summary-method="getSummaries"
         highlight-current-row
         show-summary
-        :summary-method="getSummaries"
+        size="mini"
         style="width: 100%;"
         @select-all="crud.selectAllChange"
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55"/>
-        <el-table-column show-overflow-tooltip prop="workshop_id" label="车间"/>
-        <el-table-column show-overflow-tooltip prop="material_code" width="130" label="物料编号"/>
-        <el-table-column show-overflow-tooltip prop="material_name" width="130" label="物料名称"/>
-        <el-table-column prop="askTime" label="要求到货日期" width="130" show-overflow-tooltip/>
-        <el-table-column show-overflow-tooltip prop="show_qty" min-width="120" label="重量"/>
-        <el-table-column show-overflow-tooltip prop="agree_time" min-width="120" label="确认交货日期"/>
-        <el-table-column show-overflow-tooltip prop="po_code" min-width="120" label="订单编号"/>
-        <el-table-column show-overflow-tooltip prop="instor_qty" min-width="120" label="入库重量"/>
+        <el-table-column :formatter="workshopFormat" label="车间" prop="workshop_id" show-overflow-tooltip/>
+        <el-table-column label="物料编号" prop="material_code" show-overflow-tooltip width="130"/>
+        <el-table-column label="物料名称" prop="material_name" show-overflow-tooltip width="130"/>
+        <el-table-column label="要求到货日期" prop="askTime" show-overflow-tooltip width="130"/>
+        <el-table-column label="重量" min-width="120" prop="show_qty" show-overflow-tooltip/>
+        <el-table-column label="确认交货日期" min-width="120" prop="agree_time" show-overflow-tooltip/>
+        <el-table-column label="订单编号" min-width="120" prop="po_code" show-overflow-tooltip/>
+        <el-table-column label="入库重量" min-width="120" prop="instor_qty" show-overflow-tooltip/>
         <!--        <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="安全库存" />-->
         <!--        <el-table-column label="总重量" align="center" prop="total_qty"/>-->
-        <el-table-column label="状态" align="center" prop="status" :formatter="stateFormat"/>
-        <el-table-column label="备注" align="center" prop="remark"/>
-        <el-table-column label="生成方式" align="center" prop="create_mode" :formatter="createModeFormat" min-width="100" />
-        <el-table-column label="创建人" align="center" prop="create_name" width="150"/>
-        <el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
-        <el-table-column label="提交人" align="center" prop="audit_name" width="150"/>
-        <el-table-column label="提交时间" align="center" prop="audit_time" width="140px"/>
-        <el-table-column label="采购确认人" align="center" prop="purchase_name" width="150"/>
-        <el-table-column label="采购确认时间" align="center" prop="purchase_time" width="140px"/>
-        <el-table-column label="完成人" align="center" prop="confirm_name" width="150"/>
-        <el-table-column label="完成时间" align="center" prop="confirm_time" width="140px"/>
+        <el-table-column :formatter="stateFormat" align="center" label="状态" prop="status"/>
+        <el-table-column align="center" label="备注" prop="remark"/>
+        <el-table-column :formatter="createModeFormat" align="center" label="生成方式" min-width="100" prop="create_mode"/>
+        <el-table-column align="center" label="创建人" prop="create_name" width="150"/>
+        <el-table-column align="center" label="创建时间" prop="createTime" width="150"/>
+        <el-table-column align="center" label="提交人" prop="audit_name" width="150"/>
+        <el-table-column align="center" label="提交时间" prop="audit_time" width="140px"/>
+        <el-table-column align="center" label="采购确认人" prop="purchase_name" width="150"/>
+        <el-table-column align="center" label="采购确认时间" prop="purchase_time" width="140px"/>
+        <el-table-column align="center" label="完成人" prop="confirm_name" width="150"/>
+        <el-table-column align="center" label="完成时间" prop="confirm_time" width="140px"/>
         <!--        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
                   <template slot-scope="scope">
                     <udOperation
@@ -184,10 +185,14 @@
     <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()"/>
   </div>
 </template>
-
+<style>
+.el-table .red-row {
+  background-color: red;
+}
+</style>
 <script>
 import crudPurchase from '@/views/wms/pcs/purchaseorder/purchase'
-import CRUD, {crud, header, presenter} from '@crud/crud'
+import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
@@ -197,21 +202,21 @@ import AddDialog from '@/views/wms/pcs/purchaseplan/AddDialog'
 import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
 import { download } from '@/api/data'
 import { downloadFile } from '@/utils'
-import UploadDialog from "@/views/wms/pcs/purchaseplan/UploadDialog";
+import UploadDialog from '@/views/wms/pcs/purchaseplan/UploadDialog'
 
 export default {
   name: 'PurchasePlan',
-  components: {UploadDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker},
+  components: { UploadDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
   cruds() {
     return CRUD({
       title: '',
-      optShow: {reset: true},
+      optShow: { reset: true },
       idField: 'id,desc',
       query: {
         'status': '1'
       },
       url: '/api/pcsIfPurchaseorder',
-      crudMethod: {...crudPurchase}
+      crudMethod: { ...crudPurchase }
     })
   },
   mixins: [presenter(), header(), crud()],
@@ -232,40 +237,50 @@ export default {
       storId: null
     }
   },
-  mounted: function () {
+  mounted: function() {
     const that = this
     window.onresize = function temp() {
       that.height = document.documentElement.clientHeight - 180 + 'px;'
     }
   },
   created() {
-    crudStorattr.getStor({'stor_type': '3'}).then(res => {
+    crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
       this.storlist = res.content
     })
   },
   methods: {
-        getSummaries(param) {
-      const { columns, data } = param;
-      const sums = [];
+    //确认时间比需求时间晚，预警
+    tableRowClassName({ row }) {
+      const askTime = row.askTime
+      const agreeTime = row.agree_time
+      if (askTime && agreeTime) {
+        return new Date(agreeTime) > new Date(askTime) ? 'red-row' : ''
+      }
+      return ''
+
+    },
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
       columns.forEach((column, index) => {
         if (index === 0) {
-          sums[index] = '合计';
-          return;
+          sums[index] = '合计'
+          return
         }
-        const values = data.map(item => Number(item[column.property]));
+        const values = data.map(item => Number(item[column.property]))
         if (column.property === 'show_qty' || column.property === 'instor_qty') {
           sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
+            const value = Number(curr)
             if (!isNaN(value)) {
-              return prev + curr;
+              return prev + curr
             } else {
-              return prev;
+              return prev
             }
-          }, 0);
-          sums[index] = sums[index].toFixed(3) + ' KG';
+          }, 0)
+          sums[index] = sums[index].toFixed(3) + ' KG'
         }
-      });
-      return sums;
+      })
+      return sums
     },
     bill_typeFormat(row, column) {
       return this.dict.label.ST_INV_RAW_IN_TYPE[row.bill_type]
@@ -292,6 +307,10 @@ export default {
       return this.dict.label.PURCHASE_STATUS[row.status]
     }
     ,
+    workshopFormat(row, column) {
+      return this.dict.label.product_area[row.workshop_id]
+    }
+    ,
     createModeFormat(row, column) {
       return this.dict.label.ST_CREATE_MODE[row.create_mode]
     }
@@ -303,7 +322,7 @@ export default {
   }
 }
 </script>
-<style rel="stylesheet/scss" lang="scss" scoped>
+<style lang="scss" rel="stylesheet/scss" scoped>
 ::v-deep .el-dialog__body {
   padding-top: 10px;
 }