From 00eaeb1afc9624d07f52d30444dae5bf95caee42 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 9 May 2023 15:01:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8A=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inout/orderDetailBiz.js         |  9 +++
 src/views/inout/DialogCheck.vue         | 94 +++++++++++++------------
 src/views/inout/InvoiceRegistration.vue | 86 +++++++++++-----------
 src/views/sync/SysUdimsConfig.vue       |  4 +-
 4 files changed, 102 insertions(+), 91 deletions(-)

diff --git a/src/api/inout/orderDetailBiz.js b/src/api/inout/orderDetailBiz.js
index c568b4e..b237b36 100644
--- a/src/api/inout/orderDetailBiz.js
+++ b/src/api/inout/orderDetailBiz.js
@@ -41,6 +41,15 @@ export function updateById(data) {
   });
 }
 
+
+export function updateBizById(data) {
+  return axios({
+    url: "/udiwms/inout/bizDetail/updateById",
+    method: "post",
+    data: data
+  });
+}
+
 export function insertInvoice(params) {
   return axios({
     url: "/udiwms/inout/biz/insertInvoice",
diff --git a/src/views/inout/DialogCheck.vue b/src/views/inout/DialogCheck.vue
index 168431e..9794496 100644
--- a/src/views/inout/DialogCheck.vue
+++ b/src/views/inout/DialogCheck.vue
@@ -39,7 +39,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="name">
-              <el-input v-model="inputQuery.batchNo" auto-complete="off" :disabled="true" ></el-input>
+              <el-input v-model="inputQuery.batchNo" auto-complete="off" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
 
@@ -50,7 +50,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="code">
-              <el-input v-model="inputQuery.price" auto-complete="off"  :disabled="true"></el-input>
+              <el-input v-model="inputQuery.price" auto-complete="off" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -62,7 +62,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="name">
-              <el-input v-model="inputQuery.manufacturer" auto-complete="off" :disabled="true" ></el-input>
+              <el-input v-model="inputQuery.manufacturer" auto-complete="off" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
 
@@ -73,7 +73,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="code">
-              <el-input v-model="inputQuery.certCode" auto-complete="off" :disabled="true" ></el-input>
+              <el-input v-model="inputQuery.certCode" auto-complete="off" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -83,7 +83,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="code">
-              <el-input v-model="inputQuery.productDate" auto-complete="off" :disabled="true" ></el-input>
+              <el-input v-model="inputQuery.productDate" auto-complete="off" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -93,7 +93,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="code">
-              <el-input v-model="inputQuery.measname" auto-complete="off"  :disabled="true"></el-input>
+              <el-input v-model="inputQuery.measname" auto-complete="off" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
 
@@ -164,10 +164,11 @@
           </el-col>
           <el-col :span="8">
             <el-button type="primary" size="mini" icon="search" v-if="this.inputQuery.filePath!=null"
-                       style="text-align:right" @click="showImgViewer" >
-                                    检验报告预览
+                       style="text-align:right" @click="showImgViewer">
+              检验报告预览
             </el-button>
-            <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
+            <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer"
+                             :url-list="imgList"/>
           </el-col>
 
 
@@ -181,13 +182,12 @@
 <script>
 import draggable from "vuedraggable";
 import store from "@/store";
-import {updateById} from '@/api/inout/orderDetailBiz'
+import {updateBizById, updateById} from '@/api/inout/orderDetailBiz'
 import {updateOrderDetailBiz} from '@/api/inout/order'
-import { previewImage } from '@/api/purchase/supCompany'
+import {previewImage} from '@/api/purchase/supCompany'
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 
 
-
 export default {
   name: "DialogCheck",
   props: {
@@ -208,19 +208,19 @@ export default {
   },
   data() {
     return {
-      imgList:[],
-      imgViewerVisible:false,
+      imgList: [],
+      imgViewerVisible: false,
       BASE_URL: process.env.VUE_APP_BASE_API,
       code: "",
       formData: {
-        ggxh:"",
-        cpmctymc:"",
-        machineNo:"",
-        invoiceCode:"",
-        invoiceEncode:"",
-        price:"",
-        remark:"",
-        licenseUrl:""
+        ggxh: "",
+        cpmctymc: "",
+        machineNo: "",
+        invoiceCode: "",
+        invoiceEncode: "",
+        price: "",
+        remark: "",
+        licenseUrl: ""
       },
       // formRules: {
       //   name: [
@@ -239,20 +239,20 @@ export default {
     };
   },
   components: {
-    draggable,ElImageViewer
+    draggable, ElImageViewer
   },
   methods: {
     submitUpload() {
-      updateById(this.inputQuery).then((res) =>{
-          if(res.code==20000){
-            this.$message({
-              type: "success",
-              message: "修改成功！",
-            });
-            this.closeDialog();
-          }
+      updateBizById(this.inputQuery).then((res) => {
+        if (res.code == 20000) {
+          this.$message({
+            type: "success",
+            message: "修改成功！",
+          });
+          this.closeDialog();
+        }
 
-      } )
+      })
 
 
     },
@@ -299,8 +299,8 @@ export default {
     //
     // },
     uploadHandleRemove(file, fileList) {
-      this.inputQuery.filePath=null;
-      this.inputQuery.checkFileName=null;
+      this.inputQuery.filePath = null;
+      this.inputQuery.checkFileName = null;
       console.log(file, fileList);
     },
     uploadHandlePreview(file) {
@@ -311,7 +311,7 @@ export default {
       this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
     },
     uploadOnchange(file, fileList) {
-      this.inputQuery.checkFileName=file.name;
+      this.inputQuery.checkFileName = file.name;
       let fileName = file.name;
       let uid = file.uid
       let pos = fileName.lastIndexOf(".");
@@ -340,7 +340,7 @@ export default {
     uploadHandleSuccess(response, file, fileList) {
       if (response.code === 20000) {
         this.inputQuery.filePath = response.data.name;
-       // this.onSubmit();
+        // this.onSubmit();
       } else {
         this.$message.error("文件上传失败：" + response.message);
       }
@@ -348,33 +348,37 @@ export default {
     uploadHandleError() {
 
     },
-    uploadHandleBefore(file){
+    uploadHandleBefore(file) {
       console.log(file)
       let isJPG = file.type === 'image/jpeg';
       let isPNG = file.type === 'image/png';
-      if(!isJPG&&!isPNG){
+      if (!isJPG && !isPNG) {
         this.$message.error('只能上传jpg或png格式');
       }
       return isJPG || isPNG;
     },
-    showImgViewer(row){
+    showImgViewer(row) {
       this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      this.imgList=[];
-      previewImage({imageUrl:this.inputQuery.filePath,certFileUrl:this.certFileUrl}).then(response => {
+      this.imgList = [];
+      previewImage({imageUrl: this.inputQuery.filePath, certFileUrl: this.certFileUrl}).then(response => {
         if (response.code === 20000) {
-          this.imgList=response.data;
+          this.imgList = response.data;
         }
         console.log(this.imgList)
         this.imgViewerVisible = true;
       });
-      const m = (e) => { e.preventDefault() };
+      const m = (e) => {
+        e.preventDefault()
+      };
       document.body.style.overflow = 'hidden';
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
-    closeImgViewer(){
+    closeImgViewer() {
       this.imgViewerVisible = false;
-      const m = (e) => { e.preventDefault() };
+      const m = (e) => {
+        e.preventDefault()
+      };
       document.body.style.overflow = 'auto';
       document.removeEventListener("touchmove", m, true);
     },
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 801bc6c..b6e0da9 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -196,7 +196,9 @@
         </el-table-column>
         <el-table-column label="操作" width="160" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text" :disabled="scope.row.checkStatus==1 " v-if="showSup" size="small" @click.native.stop="determine(scope.row)">确认</el-button>
+            <el-button type="text" :disabled="scope.row.checkStatus==1 " v-if="showSup" size="small"
+                       @click.native.stop="determine(scope.row)">确认
+            </el-button>
             <el-button
               type="text"
               size="small"
@@ -220,7 +222,7 @@
       <!--单据业务详情-->
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
-        <el-table v-loading="bizDetailLoading"  :data="codeDetailList" style="width: 100%" border
+        <el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
                   @row-click="BizDetail"
                   row-key="id" highlight-current-row
         >
@@ -332,11 +334,14 @@
       <!--单据业务详情-->
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow.billNo }}-发票信息</span>
-        <el-table v-loading="bizDetailLoading"  :data="bizDetailList" style="width: 100%" border
+        <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
                   row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
-
+          <el-table-column
+            label="发票代码" width="150"
+            prop="invoiceCode"
+          ></el-table-column>
           <el-table-column
             label="物资名称"
             prop="cpmctymc" width="150"
@@ -357,10 +362,6 @@
             prop="machineNo"
             show-overflow-tooltip
           ></el-table-column>
-          <el-table-column
-            label="发票代码" width="150"
-            prop="invoiceCode"
-          ></el-table-column>
           <el-table-column
             label="发票编码" width="150"
             prop="invoiceEncode"
@@ -457,9 +458,6 @@
     </el-dialog>
 
 
-
-
-
     <el-dialog
       :title="formMap[formName]"
       :visible.sync="InvoiceRegisterv"
@@ -509,7 +507,7 @@
 <script>
 import {
   deleteByOrderId,
-  getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder,filterOrderList
+  getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder, filterOrderList
 } from '../../api/inout/order'
 import {getLocalJoinByUser} from "@/api/basic/busType";
 import {getInvListByUser} from "@/api/system/invWarehouse";
@@ -547,10 +545,10 @@ export default {
   name: "IoCheckSuccessOrder",
   data() {
     return {
-      savebillno:null,
-      invoiceRow:[],
-      inputInv:[],
-      checkInvoice:false,
+      savebillno: null,
+      invoiceRow: [],
+      inputInv: [],
+      checkInvoice: false,
       imgList: [],
       imgViewerVisible: false,
       BASE_URL: process.env.VUE_APP_BASE_API,
@@ -568,11 +566,11 @@ export default {
         invCode: this.$store.getters.locInvCode,
       },
       determineVisible: false,
-      determineData:null,
+      determineData: null,
       corpLoading: false,
       fromOptions: [],
-      regId:null,
-      par:[],
+      regId: null,
+      par: [],
 
       formName: 1,
       formMap: {
@@ -701,7 +699,7 @@ export default {
       subRow: null,
     };
   },
-  components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer,InvoiceRegistrationDetermine,checkInvoice},
+  components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, InvoiceRegistrationDetermine, checkInvoice},
   methods: {
     // upData(data){
     //   this.invoiceRow = data;
@@ -722,21 +720,21 @@ export default {
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
-      this.actDateRange=[];
-      this.auditDateRange=[];
+      this.actDateRange = [];
+      this.auditDateRange = [];
       this.getList();
     },
-    InvoiceRegister1(row){
-      this.savebillno=row.billNo
-      this.inputInv=row;
-      this.checkInvoice=true;
+    InvoiceRegister1(row) {
+      this.savebillno = row.billNo
+      this.inputInv = row;
+      this.checkInvoice = true;
     },
-    closecheckInvoice(){
-      this.checkInvoice=false;
+    closecheckInvoice() {
+      this.checkInvoice = false;
       this.getList();
-      this.currentRow.billNo=this.savebillno;
-      this.bizQuery.orderIdFk=this.savebillno;
-      this.codeQuery.orderIdFk=this.savebillno;
+      this.currentRow.billNo = this.savebillno;
+      this.bizQuery.orderIdFk = this.savebillno;
+      this.codeQuery.orderIdFk = this.savebillno;
       this.getCodeDetailList();
       this.getBizDetailListInv();
 
@@ -825,8 +823,8 @@ export default {
         type: "warning",
       })
         .then(() => {
-          this.par=row;
-          this.par.regId=this.regId;
+          this.par = row;
+          this.par.regId = this.regId;
           deleteById(row)
             .then((response) => {
               if (response.code == 20000) {
@@ -857,7 +855,7 @@ export default {
       //this.resultQuery.page = 1;
 
       this.getCodeDetailList();
-     //this.getResultDetailList();
+      //this.getResultDetailList();
     },
     // 清空单据详情数据列表
     clearDetailList() {
@@ -947,9 +945,9 @@ export default {
     getInvList() {
       getInvListByUser()
         .then((response) => {
-            let invlist1= response.data || [];
-          for(var i=0;i<invlist1.length;i++){
-            if(invlist1[i].code== 1000000){
+          let invlist1 = response.data || [];
+          for (var i = 0; i < invlist1.length; i++) {
+            if (invlist1[i].code == 1000000) {
               this.invList.push(invlist1[i]);
             }
           }
@@ -1036,8 +1034,8 @@ export default {
       }
       this.bizDetailLoading = true;
       this.bizQuery.orderIdFk = this.currentRow.billNo;
-      if(row != null) {
-        this.bizQuery.orderIdFk=row.orderIdFk;
+      if (row != null) {
+        this.bizQuery.orderIdFk = row.orderIdFk;
         this.bizQuery.batchNo = row.batchNo;
         this.bizQuery.relId = row.bindRlFk;
         //this.bizQuery.bizIdFk = row.id;
@@ -1062,14 +1060,14 @@ export default {
 
 
     BizDetail(row) {
-      this.regId=row.id;
+      this.regId = row.id;
       this.bizQuery.page = 1;
       this.subRow = row;
       this.getBizDetailListInv(row);
     },
-    determine(row){
-      this.determineData=row;
-      this.determineVisible=true;
+    determine(row) {
+      this.determineData = row;
+      this.determineVisible = true;
     },
 
     //单据撤回
@@ -1098,7 +1096,7 @@ export default {
       this.Upinvoice = false;
       this.getBizDetailListInv();
       this.getOrderDetails();
-      },
+    },
 
     closeInvoice(row) {
       this.InvoiceRegisterv = false;
diff --git a/src/views/sync/SysUdimsConfig.vue b/src/views/sync/SysUdimsConfig.vue
index f3f2892..da7d84d 100644
--- a/src/views/sync/SysUdimsConfig.vue
+++ b/src/views/sync/SysUdimsConfig.vue
@@ -459,7 +459,7 @@
                 </template>
               </el-table-column>
 
-              <el-table-column width="180" label="目标单据状态">
+              <el-table-column width="180" label="同步后单据状态">
                 <template slot-scope="scope">
                   <el-select style="width: 90%"
                              v-model="scope.row.syncStatus"
@@ -576,7 +576,7 @@
                 </template>
               </el-table-column>
 
-              <el-table-column width="180" label="目标单据状态">
+              <el-table-column width="180" label="同步后单据状态">
                 <template slot-scope="scope">
                   <el-select style="width: 90%"
                              v-model="scope.row.syncStatus"