From a914c7a52f30fa06086e00fd442a95f6c3d82b6b Mon Sep 17 00:00:00 2001
From: zuowenwen <zuowenwen>
Date: Tue, 7 Dec 2021 16:57:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E4=BD=8D=EF=BC=8C=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             |  4 +-
 src/views/modules/knifemold/receive.vue       | 47 ++++++++++++++++---
 .../purchaseorder/purchaseRequisition.vue     | 36 +++++++++++++-
 src/views/modules/warehouse/location.vue      |  2 +-
 4 files changed, 78 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bc3c838..5a78c50 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3528,8 +3528,8 @@
     },
     "dayjs": {
       "version": "1.10.7",
-      "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.7.tgz",
-      "integrity": "sha1-LPX5Gt0oEWdIRAhmoKHSbzps5Gg="
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz",
+      "integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="
     },
     "dayjs": {
       "version": "1.10.7",
diff --git a/src/views/modules/knifemold/receive.vue b/src/views/modules/knifemold/receive.vue
index b86abb0..d0d92ad 100644
--- a/src/views/modules/knifemold/receive.vue
+++ b/src/views/modules/knifemold/receive.vue
@@ -10,6 +10,16 @@
       <el-form-item :label = "inputSearch2">
         <el-input style="width: 110px;"  placeholder="" v-model = "queryViewIfs.description"></el-input>
       </el-form-item>
+      <el-form-item :label="inputSearch12">
+        <el-select  v-model="queryViewIfs.receiveFlag" placeholder="请选择" style="width: 75px;">
+          <el-option
+            v-for="item in selectList.select1"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button @click="initViewIfsTable('Y')" type="primary">{{ buttons.search }}</el-button>
         <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{ buttons.defaultTable }}
@@ -101,7 +111,7 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="检验方式选择" :visible.sync="poToolFlag" width="520px">
+    <el-dialog title="检验方式选择" :visible.sync="poToolFlag" width="655px">
       <el-form :inline="true">
         <el-form-item :label = "inputSearch3">
           <el-input style="width: 90px;text-align: left;padding: 0px 5px;" @change="initQtyAlert()" oninput="value=value.replace(/^\.+|[^\d.]/g,'')" v-model = "receiveQuantity"></el-input>
@@ -109,6 +119,9 @@
         <el-form-item :label = "inputSearch4">
           <el-input style="width: 90px;text-align: left;padding: 0px 5px;" oninput="value=value.replace(/^\.+|[^\d.]/g,'')" v-model = "serviceLife"></el-input>
         </el-form-item>
+        <el-form-item :label = "inputSearch11">
+          <el-input style="width: 90px;text-align: left;padding: 0px 5px;" oninput="value=value.replace(/^\.+|[^\d.]/g,'')" v-model = "invoicePrice"></el-input>
+        </el-form-item>
         <!--<el-form-item >
           <el-radio v-model="radio" label="N">{{inputSearch5}}</el-radio>
           <el-radio style="margin-left: 10px;" v-model="radio" label="Y">{{inputSearch6}}</el-radio>
@@ -234,6 +247,15 @@
         setUp: {
           fileFlag : false,
         },
+        selectList: {
+          select1: [{
+            value: 'Y',
+            label: '显示'
+          }, {
+            value: 'N',
+            label: '不显示'
+          }],
+        },
         height: 0,
         //搜索名称
         inputSearch1 : "工具编码",
@@ -246,6 +268,8 @@
         inputSearch8 : "横幅",
         inputSearch9 : "宽幅",
         inputSearch10 : "接收号",
+        inputSearch11 : "入库价格",
+        inputSearch12 : "接收完成",
         //横幅宽幅设定
         bannersFlag : false,
         bannersBut : false,
@@ -261,6 +285,8 @@
         radio : '',
         //录入库位
         locationNo : '' ,
+        //入库价格
+        invoicePrice : 0,
         site: this.$store.state.user.site,
         addLanguage: false,
         functionId: 1001,
@@ -284,6 +310,7 @@
           limit : "",
           //页数
           page : "",
+          receiveFlag : 'N',
         },
         // 默认table 查询参数
         queryTable: {
@@ -802,7 +829,7 @@
     },
     mounted() {
       this.$nextTick(() => {
-        this.height = window.innerHeight - 250;
+        this.height = window.innerHeight - 200;
       })
     },
     watch: {
@@ -962,7 +989,16 @@
             }
           });
           return
-        }
+        }else if(this.invoicePrice <= 0){
+            this.$alert('请输入入库价格！', '使用寿命', {
+              confirmButtonText: '确定',
+              callback: action => {
+                this.serviceLife = 0
+                this.generateFlag = false
+              }
+            });
+            return
+          }
         if(this.radio == 'N'){
           this.saveToolInstanceId()
         }else{
@@ -1003,6 +1039,7 @@
           sequenceNo : this.ifsToolData.sequenceNo,
           lineItemNo : this.ifsToolData.lineItemNo,
           vendorName : this.ifsToolData.vendorName,
+          invoicePrice : this.invoicePrice,
         }
         let currQty = this.receiveQuantity
         saveToolDetail(saveData).then(({data}) =>{
@@ -1081,6 +1118,7 @@
         this.receiveQuantity = this.ifsToolData.quantity - this.ifsToolData.generateQuantity
         this.serviceLife = 0
         this.radio = '0'
+        this.invoicePrice = 0
         this.locationNo = ''
         this.generateFlag = false
         getPoToolList(queryPoTool).then(({data}) =>{
@@ -1164,7 +1202,6 @@
       // 获取button的词典
       getFunctionButtonList() {
         searchFunctionButtonList(this.queryButton).then(({data}) => {
-          console.log(data.data)
           if (data.data.length>0) {
             this.buttons = data.data
           } else {
@@ -1306,7 +1343,6 @@
         })
       },
       fields(){
-        console.log(this.columnList)
         let  json = "{"
         this.columnList.forEach((item,index) =>{
           if (index ==  this.columnList.length-1 ){
@@ -1317,7 +1353,6 @@
         })
         json +="}"
         let s = eval("(" + json + ")")
-        console.log(s)
 
         return s
       },
diff --git a/src/views/modules/purchaseorder/purchaseRequisition.vue b/src/views/modules/purchaseorder/purchaseRequisition.vue
index 5b66827..d40a4c1 100644
--- a/src/views/modules/purchaseorder/purchaseRequisition.vue
+++ b/src/views/modules/purchaseorder/purchaseRequisition.vue
@@ -220,6 +220,10 @@
                     v-model="currentPRDetailData.totalPrice"
                     :disabled="true"></el-input>
         </el-form-item>
+        <el-form-item :label="inputSearch13">
+          <el-input style="text-align: left;width: 143px" onkeyup="this.value = this.value.toUpperCase()"
+                    v-model="currentPRDetailData.orderref1"></el-input>
+        </el-form-item>
         <el-form-item style="margin-top: 30px">
           <upload v-on:childByValue="childByValue"></upload>
         </el-form-item>
@@ -351,6 +355,7 @@ export default {
       inputSearch10: '供应商名称',
       inputSearch11: '刀模名称',
       inputSearch12: '审批结果',
+      inputSearch13: '工具类型',
       currentPRDetailData: {
         username: this.$store.state.user.name,
         requisitionno: '',
@@ -576,6 +581,23 @@ export default {
           status: true,
           fixed: false
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 2001,
+          serialNumber: 'PRHeader2001EnterDate',
+          tableId: "PRHeaderTable",
+          tableName: "PRHeader",
+          columnProp: "enterDate",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "创建时间",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 2001,
@@ -1134,6 +1156,14 @@ export default {
           }
         });
         return
+      }else if (this.currentPRDetailData.orderref1.trim() === "") {
+        this.$alert('请输入工具类型！', '操作提示', {
+          confirmButtonText: '确定',
+          callback: action => {
+            this.bannersBut = false
+          }
+        });
+        return
       }
       let partNo = this.currentPRDetailData.partno.toUpperCase()
       this.currentPRDetailData.partno = partNo
@@ -1197,6 +1227,7 @@ export default {
         this.currentPRDetailData.status = '已下达'
         this.currentPRDetailData.taxCode = ''
         this.currentPRDetailData.partdesc = ''
+        this.currentPRDetailData.orderref1 = ''
       } else {
         this.currentPRDetailData.requisitionno = row.requisitionno
         this.currentPRDetailData.itemno = row.itemno
@@ -1209,12 +1240,13 @@ export default {
         this.currentPRDetailData.status = ''
         this.currentPRDetailData.taxCode = row.taxCode
         this.currentPRDetailData.partDesc = row.partdesc
+        this.currentPRDetailData.orderref1 = row.orderref1
         this.getFileList(row)
       }
-      if (val != 'Y') {
+/*      if (val != 'Y') {
         this.currentPRDetailData.orderref1 = null
         this.currentPRDetailData.orderref2 = null
-      }
+      }*/
       this.getNumber()
       this.bannersBut = false
       this.addPRDetailFlag = true
diff --git a/src/views/modules/warehouse/location.vue b/src/views/modules/warehouse/location.vue
index c5efc0a..281a719 100644
--- a/src/views/modules/warehouse/location.vue
+++ b/src/views/modules/warehouse/location.vue
@@ -619,7 +619,7 @@ import {
           });
           return
         }else if(this.saveHeaderData.warehouseId == ''){
-          this.$alert("请选择库房代码！", '操作提示', {
+          this.$alert("请选择库房名称！", '操作提示', {
             confirmButtonText: '确定',
             callback: action => {
               this.setUp.saveButton = false