From 8ccbcdcc2375187902d048f7fff12fd3bf836ae0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Sun, 30 Jul 2023 10:01:53 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E5=85=A5=E9=99=A2=E7=89=A9=E8=B5=84=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=EF=BC=8C=E5=A4=9A=E7=BA=A7=E5=8C=85=E8=A3=85=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=9B=E4=B8=94?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=8C=85=E8=A3=85=E5=B1=82=E7=BA=A7=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E4=BF=A1=E6=81=AF=E6=97=B6=EF=BC=8C=E5=BA=95=E4=B8=8B?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=E6=A0=8F=E4=B8=8D=E4=BC=9A?=
 =?UTF-8?q?=E6=9C=89=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/supplier/company/basicCompanyproductDetail.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/supplier/company/basicCompanyproductDetail.vue b/src/views/supplier/company/basicCompanyproductDetail.vue
index 1ef3295..9bb59c2 100644
--- a/src/views/supplier/company/basicCompanyproductDetail.vue
+++ b/src/views/supplier/company/basicCompanyproductDetail.vue
@@ -749,7 +749,7 @@
               <el-col :span="12" class="el-col">
                 <div class="text item">
                   <div class="itemTag">
-                    <span>包装级别:&nbsp;</span>
+                    <span>包装层级:&nbsp;</span>
                   </div>
 
                   <el-input
@@ -1032,6 +1032,9 @@ export default {
       this.thisData = this.editQuery;
       this.selectErpDialogVisible = true;
     },
+    handleDetail(row) {
+      this.editQuery = row;
+    },
     removeDi() {
       this.$confirm("此操作将解除该绑定DI器械信息, 是否继续?", "提示", {
         confirmButtonText: "确定",

From 7e95fb34252bff13e4da82c9034b7218280a8380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Sun, 30 Jul 2023 10:35:31 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E9=80=81=E8=B4=A7=E5=8D=95=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E7=9A=84=E2=80=98=E6=B3=A8=E5=86=8C=E5=A4=87=E6=A1=88?=
 =?UTF-8?q?=E5=8F=B7=E2=80=99=EF=BC=8C=E6=B5=81=E8=BD=AC=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=A1=A5=E5=8D=95=E6=88=90=E5=88=B0=E8=B4=A7=E3=80=81=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=90=8E=E4=BC=9A=E5=8F=91=E7=94=9F=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/IoDeliverySearchOrder.vue | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index 7cce311..2fac01e 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -479,11 +479,18 @@
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
-          <el-table-column
-            label="注册/备案号" width="180"
-            prop="certCode"
-            show-overflow-tooltip
-          ></el-table-column>
+<!--          <el-table-column-->
+<!--            label="注册/备案号" width="180"-->
+<!--            prop="certCode"-->
+<!--            show-overflow-tooltip-->
+<!--          ></el-table-column>-->
+          <el-table-column label="注册/备案号" width="180">
+            <template slot-scope="scope">
+              <div v-if="scope.row.certCode">
+                <span>{{ scope.row.certCode.split(',')[0] }}</span>
+              </div>
+            </template>
+          </el-table-column>
         </el-table>
         <pagination
           v-show="codeTotal>0"

From 42f7da0483df7e83435b49f03a3f268b852aa951 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sun, 30 Jul 2023 10:42:35 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=99=BB=E8=AE=B0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/InvoiceRegByFp.vue            |  1 -
 src/views/inout/InvoiceRegCkeck.vue           | 65 ++++++++++---------
 .../purOrder/purOrderDetailDialog.vue         |  2 +-
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/views/inout/InvoiceRegByFp.vue b/src/views/inout/InvoiceRegByFp.vue
index 5492f13..466a59e 100644
--- a/src/views/inout/InvoiceRegByFp.vue
+++ b/src/views/inout/InvoiceRegByFp.vue
@@ -680,7 +680,6 @@ export default {
       // this.resultDetailList = [];
     },
     handleInvoiceChange(val) {
-      debugger
       this.cowEn=val;
       this.getOrderList(val)
       this.getProductDetailList(val)
diff --git a/src/views/inout/InvoiceRegCkeck.vue b/src/views/inout/InvoiceRegCkeck.vue
index 4a7dbf5..34af388 100644
--- a/src/views/inout/InvoiceRegCkeck.vue
+++ b/src/views/inout/InvoiceRegCkeck.vue
@@ -1,6 +1,8 @@
 <template>
   <div style="display: flex; flex-direction: column">
-    <el-button size="small" style="margin-left: auto; margin-right: 15px" type="primary" icon="el-icon-bottom-right" @click="onSubmit">登记</el-button>
+    <el-button size="small" style="margin-left: auto; margin-right: 15px" type="primary" icon="el-icon-bottom-right"
+               @click="onSubmit">登记
+    </el-button>
     <el-form :model="inputQuery" :rules="formRules" ref="dataForm" label-width="150px" style="padding-top: 40px">
       <el-card style="margin-top: -30px">
         <el-row>
@@ -150,7 +152,8 @@
         >选择单据
         </el-button>
       </el-button-group>
-      <el-table v-loading="loading"  @current-change="handleSelectionChange" :data="list" style="width: 100%" highlight-current-row border>
+      <el-table v-loading="loading" @current-change="handleSelectionChange" :data="list" style="width: 100%"
+                highlight-current-row border>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
@@ -167,17 +170,17 @@
         <el-table-column label="总金额" prop="allAmount" width="120"></el-table-column>
         <el-table-column label="操作" width="100" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text"   size="small" @click.native.stop="delectSub(scope.row)">删除</el-button>
+            <el-button type="text" size="small" @click.native.stop="delectSub(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="filterQuery.page"
-        :limit.sync="filterQuery.limit"
-        @pagination="getCodeDetailLists"
-      />
+<!--      <pagination-->
+      <!--        v-show="total > 0"-->
+      <!--        :total="total"-->
+      <!--        :page.sync="filterQuery.page"-->
+      <!--        :limit.sync="filterQuery.limit"-->
+      <!--        @pagination="getCodeDetailLists"-->
+      <!--      />-->
     </el-tabs>
 
 
@@ -248,17 +251,17 @@ import {
   uploadInvoice,
   updateOrder,
   filterBizOrderList,
-  updateorderBiz, parseInvoice, deleteInvoiceByOrderFk,checkInvoiceCode
+  updateorderBiz, parseInvoice, deleteInvoiceByOrderFk, checkInvoiceCode
 } from '@/api/inout/orderDetailBiz'
 import AcceptOrder from '@/views/inout/DialogReviewOrder'
 import DialogInvoice from '@/views/inout/DialogInvoice'
 import InvoiceRegister from '@/views/inout/InvoiceRegister'
-import { previewImage, previewFile } from '@/api/purchase/supCompany'
+import {previewImage, previewFile} from '@/api/purchase/supCompany'
 import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
 import store from '@/store'
 import invoiceSelectRegByOrder from '@/views/inout/InvoiceSelectRegByOrder'
-import { filterInvoiceList } from '@/api/inout/order'
-import { isBlank } from '@/utils/strUtil'
+import {filterInvoiceList} from '@/api/inout/order'
+import {isBlank} from '@/utils/strUtil'
 
 const formJson = {
   site_id: '',
@@ -309,9 +312,7 @@ export default {
         billNo: null,
         mainAction: null,
         action: null,
-        page: 1,
         supInoivceSearch: 'supInvoice',
-        limit: 10,
         startTime: null,
         endTime: null,
       },
@@ -331,10 +332,10 @@ export default {
         //   { required: true, message: "请输入发票代码", trigger: "blur" },
         // ],
         invoiceEncode: [
-          { required: true, message: '请输入发票编码', trigger: 'blur' }
+          {required: true, message: '请输入发票编码', trigger: 'blur'}
         ],
-        price: [{ required: true, message: '请输入发票价格', trigger: 'blur' }],
-        invoiceDate: [{ required: true, message: '请选择开票日期', trigger: 'blur' }]
+        price: [{required: true, message: '请输入发票价格', trigger: 'blur'}],
+        invoiceDate: [{required: true, message: '请选择开票日期', trigger: 'blur'}]
       },
       certFileUrl: '',
       Upinvoice: false,
@@ -455,10 +456,10 @@ export default {
       subRow: null
     }
   },
-  components: { AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, invoiceSelectRegByOrder },
+  components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, invoiceSelectRegByOrder},
   methods: {
     onSubmit() {
-      if (this.list == null || this.list.length==0) {
+      if (this.list == null || this.list.length == 0) {
         this.$message.error('请选择要登记的物资! ')
         return false
       }
@@ -592,8 +593,8 @@ export default {
     getOrderDetail() {
       this.codeQuery.page = 1
       this.getCodeDetailLists()
-      this.codeDetailList=[]
-      this.currentRow={
+      this.codeDetailList = []
+      this.currentRow = {
         billNo: ''
       }
       //this.getResultDetailList();
@@ -683,7 +684,7 @@ export default {
         let binaryData = []
         previewFile(this.certFileUrl).then(res => {
           binaryData.push(res)
-          let URL = window.URL.createObjectURL(new Blob(binaryData, { type: pdf }))
+          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}))
           window.open(URL)
         })
         // window.open(this.imgList[0])
@@ -712,9 +713,9 @@ export default {
         this.$message.error('发票编码不能为空！')
         return
       }
-      if(this.list.length==0){
+      if (this.list.length == 0) {
         //查询发票编码有没有重复
-        checkInvoiceCode({invoiceEncode:this.inputQuery.invoiceEncode})
+        checkInvoiceCode({invoiceEncode: this.inputQuery.invoiceEncode})
           .then((response) => {
             if (response.code === 20000) {
               this.invoiceSelectRegByOrderVisible = true
@@ -725,16 +726,16 @@ export default {
           .catch((response) => {
             this.$message.error(response.message)
           })
-      }else{
+      } else {
         this.invoiceSelectRegByOrderVisible = true
       }
     },
-    closeAcceptDialog(){
+    closeAcceptDialog() {
       this.invoiceSelectRegByOrderVisible = false
       this.getCodeDetailLists()
     },
-    delectSub(row){
-      deleteInvoiceByOrderFk({billNo:row.billNo,invoiceEncode:this.inputQuery.invoiceEncode})
+    delectSub(row) {
+      deleteInvoiceByOrderFk({billNo: row.billNo, invoiceEncode: this.inputQuery.invoiceEncode})
         .then((response) => {
           if (response.code === 20000) {
             this.getOrderDetail();
@@ -788,8 +789,8 @@ export default {
       ADMIN_ID: store.getters.adminId,
       ADMIN_TOKEN: store.getters.token
     }
-    if(this.curInvoice.id!=null){
-      this.inputQuery=this.curInvoice
+    if (this.curInvoice.id != null) {
+      this.inputQuery = this.curInvoice
       this.getOrderDetail();
     }
   }
diff --git a/src/views/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue
index 95a199a..1fc5a1f 100644
--- a/src/views/purchase/purOrder/purOrderDetailDialog.vue
+++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue
@@ -460,7 +460,7 @@ export default {
     targetInvChange() {
       let query = {
         enable: true,
-        spUse: 1,
+        spUse: true,
         invCode: this.formData.invCode
       }
       getLocalJoinByUser(query)

From 6ed5424b89f59b60d03d908ed37ffc546cb34eb2 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sun, 30 Jul 2023 11:19:15 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=20=E5=88=87=E6=8D=A2=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20=20total=E4=B8=8D=E5=8F=98=E5=8C=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/IoDeliverySearchOrder.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index 2fac01e..f48dc65 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -258,7 +258,7 @@
       </el-table>
       <pagination
         v-show="total>0"
-        :total="total"
+        :total.sync="total"
         :limit.sync="filterQuery.limit"
         :page.sync="filterQuery.page"
         @pagination="getList"
@@ -1056,6 +1056,7 @@ export default {
       // this.filterQuery.busType = 2;     //送货出入库单据类型
       getOrderList(this.filterQuery)
         .then((response) => {
+          debugger
           this.loading = false;
           if (response.code === 20000) {
             this.list = response.data.list || [];

From 74d0b1b87b04cb1f47ed5dfffb013706c6d029bd Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sun, 30 Jul 2023 11:59:26 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/IoDeliverySearchOrder.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index f48dc65..3432a7d 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -45,7 +45,7 @@
                          clearable>
                 <el-option
                   v-for="item in busTypes"
-                  :key="item.name"
+                  :key="item.id"
                   :label="item.name"
                   :value="item.action">
                   <span style="float: left">{{ item.name }}</span>
@@ -258,7 +258,7 @@
       </el-table>
       <pagination
         v-show="total>0"
-        :total.sync="total"
+        :total="total"
         :limit.sync="filterQuery.limit"
         :page.sync="filterQuery.page"
         @pagination="getList"
@@ -1056,7 +1056,6 @@ export default {
       // this.filterQuery.busType = 2;     //送货出入库单据类型
       getOrderList(this.filterQuery)
         .then((response) => {
-          debugger
           this.loading = false;
           if (response.code === 20000) {
             this.list = response.data.list || [];

From fd530f53f51acd5c91808f0fdedfdf8c5266b0b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Sun, 30 Jul 2023 15:34:31 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E2=80=9D=E9=A1=B5=E9=9D=A2=E7=9A=84=E7=B4=A7?=
 =?UTF-8?q?=E6=80=A5=E7=A8=8B=E5=BA=A6=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/purOrder/purOrderDetailDialog.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue
index 1fc5a1f..93cc76a 100644
--- a/src/views/purchase/purOrder/purOrderDetailDialog.vue
+++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue
@@ -33,13 +33,13 @@
         <el-row>
           <el-col :span="11">
             <el-form-item label="紧急程度:" prop="emergency">
-              <el-select v-model="formData.emergency" :disabled="true" placeholder="请选择紧急程度" style="width: 90%"
-                         clearable>
-                <el-option label="正常" :value=1></el-option>
-                <el-option label="较急" :value=2></el-option>
-                <el-option label="特急" :value=3></el-option>
+              <el-select v-model="formData.emergency" :disabled="true" placeholder="请选择紧急程度" style="width: 90%" clearable>
+                <el-option label="正常" value=1></el-option>
+                <el-option label="较急" value=2></el-option>
+                <el-option label="特急" value=3></el-option>
               </el-select>
             </el-form-item>
+
           </el-col>
           <el-col :span="11">
             <el-form-item label="到货截止:" prop="arrivalTime">
@@ -215,6 +215,7 @@ export default {
         autoPurchase: true,
         targetInv: 1000,
         targetSubInv: null,
+        emergency: null,
         targetBillAction: null
       },
       formRules: {},