Merge remote-tracking branch 'origin/master'

src/api/inout/orderDetailBiz.js

@@ -57,6 +57,14 @@ export function insertInvoice(params) {
   });
 }
 
+export function parseInvoice(params) {
+  return axios({
+    url: "/udiwms/inout/biz/parseInvoice",
+    method: "get",
+    params: params
+  });
+}
+
 export function updateorderBiz(params) {
   return axios({
     url: "/udiwms/inout/biz/updateorderBiz",

src/views/inout/InvoiceCkeck.vue

@@ -13,25 +13,28 @@
       :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">
+            <el-form-item label="机器编码:" prop="machineNo">
               <el-input
                 v-model="inputQuery.machineNo"
                 auto-complete="off"
@@ -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"
@@ -258,7 +267,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,12 +350,12 @@ export default {
         1: "发票登记",
       },
       formRules: {
-        machineNo: [
+        // machineNo: [
-          {required: true, message: "请输入机械编码", trigger: "blur"},
+        //   {required: true, message: "请输入机械编码", trigger: "blur"},
-        ],
+        // ],
-        invoiceCode: [
+        // invoiceCode: [
-          {required: true, message: "请输入发票代码", trigger: "blur"},
+        //   {required: true, message: "请输入发票代码", trigger: "blur"},
-        ],
+        // ],
         invoiceEncode: [
           {required: true, message: "请输入发票编码", trigger: "blur"},
         ],
@@ -479,14 +488,14 @@ export default {
         this.$message.error("请选择要登记的物资! ");
         return false;
       }
-      if (this.$isBlank(this.inputQuery.machineNo)) {
+      // if (this.$isBlank(this.inputQuery.machineNo)) {
-        this.$message.error("机械编码不能为空！");
+      //   this.$message.error("机械编码不能为空！");
-        return;
+      //   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;
@@ -500,6 +509,14 @@ 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) {
@@ -518,6 +535,23 @@ 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) {

src/views/inventory/addInvRemindSetDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="formData" label-width="200px" style="margin-bottom: -15px">
+    <el-form :model="formData" label-width="200px">
       <el-row>
         <el-col :span="10">
           <el-form-item class="query-form-item" label="仓库：">

src/views/purchase/company/supCompanyAduditDialog.vue

@@ -55,7 +55,8 @@
               <el-cascader
                 size="small"
                 :options="options"
-                v-model="selectedOptions" disabled
+                v-model="selectedOptions"
+                disabled
                 placeholder="请选择所属地区"
                 style="width: 100%"
                 @change="handleChange"
@@ -456,7 +457,7 @@ export default {
   },
   created() {
     this.getCompanyCertList();
-    this.customerlist();
+   // this.customerlist();
     this.selectedOptions = this.inputQuery.areaCode.split(",");
 
 

src/views/purchase/purPlan/purPlanSearch.vue

@@ -307,6 +307,7 @@ export default {
         editStatus: 1,
         deptCode: this.invCodebe,
       };
+      this.getInvList();
       this.actDateRange = [];
       this.actAuditDateRange = [];
       this.getList();

src/views/thirdSys/inv/index.vue

@@ -23,7 +23,7 @@
         <el-form-item>
           <el-button-group>
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-            <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
             <el-button type="primary" @click.native="handleForm(null, null,'addTop')"
                        icon="el-icon-plus" :disabled="!configParms.basicThirdInv"
             >添加部门/科室
@@ -417,6 +417,11 @@ export default {
     onSubmit() {
       this.getList();
     },
+    search(){
+      this.query.page=1;
+      this.getList();
+    },
+
     getList() {
       this.loading = true;
       filterThrList(this.query)

src/views/thirdSys/product/thrProductsSelect.vue

@@ -51,7 +51,7 @@
         <el-button-group style="display:flex;">
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-          <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
           <el-button type="primary" icon="el-icon-upload2" @click="selectExport" v-if="selectType==0">选中导出</el-button>
           <el-button type="primary" icon="el-icon-upload2" @click="allExport" v-if="selectType==0">结果全部导出</el-button>
           <el-button type="primary" icon="el-icon-top-upload" @click="uploadSmp" v-if="selectType==1">选中上传</el-button>
@@ -174,6 +174,11 @@ export default {
       this.getList();
     },
 
+    search(){
+      this.filterQuery.page=1;
+      this.getList();
+    },
+
     getList() {
       this.loading = true;
       this.filterQuery.isDownThrSys = this.isDownThrSys;