Merge remote-tracking branch 'origin/master'

src/api/inout/orderDetailBiz.js

@@ -100,6 +100,15 @@ export function filterBizOrderList(params) {
   });
 }
 
+export function parseInvoice(params) {
+  return axios({
+    url: "/udiwms/inout/biz/parseInvoice",
+    method: "get",
+    params: params
+  });
+}
+
+
 
 
 

src/views/inout/DialogSelectPurOrder.vue

@@ -10,12 +10,13 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="采购部门">
-              <el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择采购部门">
+              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" @change="change" style="width: 90%">
                 <el-option
-                  v-for="item in invList"
+                  v-for="item in deptList"
-                  :key="item.name"
+                  :key="item.code"
                   :label="item.name"
-                  :value="item.code">
+                  :value="item.code"
+                >
                   <span style="float: left">{{ item.name }}</span>
                 </el-option>
               </el-select>
@@ -23,16 +24,16 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="收货仓库">
-              <el-select v-model="filterQuery.deptCode" placeholder="请选择收货仓库" style="width: 90%">
+              <el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择收货仓库">
                 <el-option
-                  v-for="item in deptList"
+                  v-for="item in invList"
-                  :key="item.code"
+                  :key="item.name"
                   :label="item.name"
-                  :value="item.code"
+                  :value="item.code">
-                >
                   <span style="float: left">{{ item.name }}</span>
                 </el-option>
               </el-select>
+
             </el-form-item>
           </el-col>
         </el-row>
@@ -337,7 +338,16 @@ export default {
       this.pickerUpOptions = [];
       this.getList();
     },
+    change(val){
+      let param={
+        pcode:val
+      }
+      getInvListByUser(param).then((res) => {
+        this.invList = res.data || [];
+        this.getBusType();
+      })
 
+    },
     onSubmitFind() {
       this.filterQuery.page = 1;
       this.getList();

src/views/inout/DialogThrReviewOrder.vue

@@ -108,14 +108,14 @@
         </el-table-column>
         <el-table-column label="注册/备案号" width="150" prop="certCode"></el-table-column>
 
-        <el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">
+        <!--<el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">-->
-        </el-table-column>
+        <!--</el-table-column>-->
-        <el-table-column label="销售发票号（第一票）" width="180" prop="firstSalesInvNo">
+        <!--<el-table-column label="销售发票号（第一票）" width="180" prop="firstSalesInvNo">-->
-        </el-table-column>
+        <!--</el-table-column>-->
-        <el-table-column label="销售发票号（第二票）" width="180" prop="secSalesInvNo">
+        <!--<el-table-column label="销售发票号（第二票）" width="180" prop="secSalesInvNo">-->
-        </el-table-column>
+        <!--</el-table-column>-->
-        <el-table-column label="发票日期" width="150" prop="invoiceDate">
+        <!--<el-table-column label="发票日期" width="150" prop="invoiceDate">-->
-        </el-table-column>
+        <!--</el-table-column>-->
       </el-table>
     </el-card>
   </div>

src/views/inout/InvoiceCkeck.vue

@@ -13,22 +13,25 @@
       :model="inputQuery"
       :rules="formRules"
       ref="dataForm"
-      label-width="110px"
+      label-width="150px"
       style="padding-top: 40px"
     >
       <el-card style="margin-top: -30px">
-        <!--<el-row>-->
+        <el-row>
-        <!--  <el-col :span="20">-->
+          <el-col :span="20">
-        <!--    <el-form-item prop="code" label="发票码:">-->
+            <el-form-item prop="code" label="请扫入发票二维码:">
-        <!--      <el-input-->
+              <el-input
-        <!--        id="inputer"-->
+                id="inputer"
-        <!--        placeholder="请输入发票码"-->
+                @focus="getInputFocus($event)"
-        <!--        type="tel"-->
+                @keypress.enter.native="enterKey($event)"
-        <!--        :disabled="true"-->
+                ref="inputRef"
-        <!--      ></el-input>-->
+                style="ime-mode: disabled"
-        <!--    </el-form-item>-->
+                type="password"
-        <!--  </el-col>-->
+                v-model="inputQuery.code"
-        <!--</el-row>-->
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="11">
             <el-form-item label="机器编码:" prop="machineNo">
@@ -205,6 +208,12 @@
             width="100"
           ></el-table-column>
 
+          <el-table-column
+            label="金额"
+            prop="amount"
+            width="100"
+          ></el-table-column>
+
           <el-table-column
             label="生产日期"
             prop="productDate"
@@ -256,7 +265,7 @@ import {
   insertInvoice,
   updateOrder,
   filterBizOrderList,
-  updateorderBiz,
+  updateorderBiz,parseInvoice
 } from "@/api/inout/orderDetailBiz";
 import AcceptOrder from "@/views/inout/DialogReviewOrder";
 import DialogInvoice from "@/views/inout/DialogInvoice";
@@ -341,9 +350,9 @@ export default {
         // machineNo: [
         //   { required: true, message: "请输入机器编码", trigger: "blur" },
         // ],
-        invoiceCode: [
+        // invoiceCode: [
-          { required: true, message: "请输入发票代码", trigger: "blur" },
+        //   { required: true, message: "请输入发票代码", trigger: "blur" },
-        ],
+        // ],
         invoiceEncode: [
           { required: true, message: "请输入发票编码", trigger: "blur" },
         ],
@@ -480,10 +489,10 @@ export default {
       //   this.$message.error("机器编码不能为空！");
       //   return;
       // }
-      if (this.$isBlank(this.inputQuery.invoiceCode)) {
+      // if (this.$isBlank(this.inputQuery.invoiceCode)) {
-        this.$message.error("发票代码不能为空！");
+      //   this.$message.error("发票代码不能为空！");
-        return;
+      //   return;
-      }
+      // }
       if (this.$isBlank(this.inputQuery.invoiceEncode)) {
         this.$message.error("发票编码不能为空！");
         return;
@@ -497,6 +506,15 @@ export default {
         return;
       }
       this.inputQuery.list = this.invoiceRow;
+      let mount=0;
+      for(var i=0;i<this.invoiceRow.length;i++){
+        mount+=this.invoiceRow[i].amount
+      }
+      if(mount  != this.inputQuery.price){
+        this.$message.error("价格不匹配！");
+        return;
+      }
+
       insertInvoice(this.inputQuery)
         .then((response) => {
           if (response.code === 20000) {
@@ -515,6 +533,25 @@ export default {
       });
     },
 
+    getInputFocus(event) {
+      event.currentTarget.select();
+    },
+
+    enterKey(){
+      let param={
+        code :this.inputQuery.code
+      }
+      parseInvoice(param)
+        .then((res)=>{
+          if(res.code == 20000){
+            this.inputQuery=res.data;
+          }
+        })
+
+
+    },
+
+
     uploadHandleError() {},
     uploadHandleSuccess(response, file, fileList) {
       debugger;

src/views/inventory/addInvRemindSetDialog.vue

@@ -166,6 +166,13 @@ export default {
       getInfoByInvId({invId: this.invId}).then((res) => {
         if (res.code === 20000) {
           this.formData = res.data;
+          if(res.data.lowStock==null || res.data.lackStock==null || res.data.overStock==null || res.data.expireDate==null || res.data.recentDate==null){
+            this.formData.lowStock=false;
+            this.formData.lackStock=false;
+            this.formData.overStock=false;
+            this.formData.expireDate=false;
+            this.formData.recentDate=false;
+          }
         } else {
           this.$message.error(res.meesage);
         }

src/views/purchase/purOrder/purOrderDetailDialog.vue

@@ -196,6 +196,7 @@ export default {
   },
   data() {
     return {
+      autoPurchase: true,
       code: '',
       query: {
         orderIdFk: '',
@@ -279,7 +280,6 @@ export default {
           this.loading = false
         })
     },
-
     saveOrder(status) {
       let tip = ''
       if (status == '1') {
@@ -502,7 +502,8 @@ export default {
       this.formData.targetInv = 1000
       this.orderEditor = true
       this.sValue = this.formData.corpName
-      this.formData.autoPurchase = true;
+      // this.formData.autoPurchase = true
+      this.$set(this.formData, 'autoPurchase', true)
       this.getStockOrderDetailList()
     } else {
       this.formData = {

src/views/purchase/purOrder/purOrderSearch.vue

@@ -23,8 +23,9 @@
             <el-form-item label="采购部门">
               <el-select
                 v-model="filterQuery.deptCode"
-                placeholder="请选择收货仓库"
+                placeholder="请选择采购部门"
                 style="width: 90%"
+                @change="change"
                 clearable
               >
                 <el-option
@@ -43,7 +44,7 @@
               <el-select
                 v-model="filterQuery.invCode"
                 style="width: 90%"
-                placeholder="请选择采购部门"
+                placeholder="请选择收货仓库"
                 clearable
               >
                 <el-option
@@ -440,6 +441,19 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
+
+    change(val){
+      let param={
+        pcode:val
+      }
+      getInvListByUser(param).then((res) => {
+        // console.log("res1", res);
+        this.invList = res.data || [];
+      });
+
+    },
+
+
     // 帮助按钮点击事件
     help() {
       this.certFileUrl =