From f8a186618a628cba573b9ce249f1a567a60fe40e Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 27 Jun 2023 09:07:29 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/productCategory.vue   | 123 +++++++++---------
 .../purApply/purOrderSelectProduct.vue        |  11 +-
 2 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/src/views/basic/product/productCategory.vue b/src/views/basic/product/productCategory.vue
index a7396e1e..653833b3 100644
--- a/src/views/basic/product/productCategory.vue
+++ b/src/views/basic/product/productCategory.vue
@@ -19,9 +19,10 @@
                   <el-button
                     type="text"
                     size="mini"
+                    style="margin-left: 10px"
                     @click="() => append(data,'add')">
-            新增
-          </el-button>
+                  新增
+                </el-button>
                 <el-button
                   type="text"
                   size="mini"
@@ -331,7 +332,7 @@
                   v-model="subData.parentCode"
                   :options="fromDeptOptions"
                   :normalizer="normalizer"
-                  :clearable = "false"
+                  :clearable="false"
                   :show-count="true"
                   placeholder="选择上级菜单"
                 />
@@ -1331,7 +1332,6 @@
       </el-dialog>
 
 
-
     </el-card>
   </div>
 </template>
@@ -1364,26 +1364,26 @@ export default {
       checked: false,
       sysList: [],
       productRemarkSet: {},
-      inputQuery:{},
-      editDialogVisible:false,
+      inputQuery: {},
+      editDialogVisible: false,
       loading: false,
-      total:0,
-      list:[],
+      total: 0,
+      list: [],
       selectHospProductVisible: false,
-      rId:null,
+      rId: null,
       subFormVisible: false,
       formMap: {
         add: "新增",
         edit: "编辑"
       },
-      fromDeptOptions:[],
+      fromDeptOptions: [],
       subData: {},
-      formName:null,
+      formName: null,
       showSearch: true,
       treeList: [],
-      Dictionary: false, //物资字典分类显示、隐藏
+      Dictionary: true, //物资字典分类显示、隐藏
       filterQuery: {
-        code:"",
+        code: "",
         parentCode: "",
         unionCode: null,
         udiCode: null,
@@ -1447,7 +1447,7 @@ export default {
     },
 
 
-    diEdit(row){
+    diEdit(row) {
       this.uuid = row.uuid;
       this.relId = row.id;
       this.isImport = false;
@@ -1488,27 +1488,27 @@ export default {
           this.sysList = [];
         });
     },
-    deleteDialog(row){
-      this.$confirm('确认删除吗?','提示',{
+    deleteDialog(row) {
+      this.$confirm('确认删除吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       })
-        .then(()=>{
-          let param={
-            id:row.bpcrid
+        .then(() => {
+          let param = {
+            id: row.bpcrid
           }
           deleterel(param)
             .then((res) => {
-              if(res.code == 20000){
+              if (res.code == 20000) {
                 this.$message.success("删除成功!");
-              }else{
+              } else {
                 this.$message.error(res.message);
               }
-                this.getList();
+              this.getList();
             })
         })
-        .catch(()=>{
+        .catch(() => {
 
         })
 
@@ -1516,22 +1516,21 @@ export default {
     },
 
 
-
-    closeCategory(){
-      this.selectHospProductVisible=false;
+    closeCategory() {
+      this.selectHospProductVisible = false;
       this.getList();
     },
-    handleCurrentChange(val){
-      this.filterQuery.page=val.page;
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
       this.getList();
 
     },
 
-    handleForm(){
-      if(this.rId == null || this.rId == 10000){
+    handleForm() {
+      if (this.rId == null || this.rId == 10000) {
         this.$message("请选择分类!");
         this.selectHospProductVisible = false;
-      }else{
+      } else {
         this.selectHospProductVisible = true;
       }
 
@@ -1545,22 +1544,22 @@ export default {
       } else {
         this.filterQuery.code = null;
       }
-      this.filterQuery.page=1;
+      this.filterQuery.page = 1;
       this.getList();
     },
 
 
-    remove(node, data){
+    remove(node, data) {
       debugger
-      if(data.id){
-        this.$confirm("确认删除该节点吗?", "提示",{
-          type:"warning",
+      if (data.id) {
+        this.$confirm("确认删除该节点吗?", "提示", {
+          type: "warning",
         })
-          .then(()=>{
+          .then(() => {
             this.deleteLoading = true;
-            let param={id:data.id,code:data.code };
+            let param = {id: data.id, code: data.code};
             deleteBasicHospType(param)
-              .then((response) =>{
+              .then((response) => {
                 this.deleteLoading = false;
                 if (response.code !== 20000) {
                   this.$message.error(response.message);
@@ -1569,29 +1568,28 @@ export default {
                 this.getTerrList();
                 this.$message.success("删除成功");
               })
-              .catch(()=>{
+              .catch(() => {
                 this.deleteLoading = false;
               })
 
           })
-          .catch(()=>{
+          .catch(() => {
             this.$message.info("取消删除");
           })
       }
     },
 
 
-
-    forInvSubmit(){ // 新增 编辑 提交
-      if(this.subData.code!=10000 && this.subData.parentCode==null){
+    forInvSubmit() { // 新增 编辑 提交
+      if (this.subData.code != 10000 && this.subData.parentCode == null) {
         this.$message.error("上级菜单不能为空");
         return
       }
-      if(this.subData.name==null){
+      if (this.subData.name == null) {
         this.$message.error("名称不能为空！");
         return
       }
-      if(this.subData.id!=null){
+      if (this.subData.id != null) {
         uodateBasicHospType(this.subData).then((response) => {
           if (response.code == 20000) {
             this.subFormVisible = false;
@@ -1602,7 +1600,7 @@ export default {
         }).catch(() => {
           this.subFormVisible = false;
         });
-      }else{
+      } else {
         saveBasicHospType(this.subData).then((response) => {
           if (response.code == 20000) {
             this.subFormVisible = false;
@@ -1616,12 +1614,10 @@ export default {
       }
 
 
-
     },
 
 
-
-    hideForm(){
+    hideForm() {
       this.formVisible = false;
       this.subFormVisible = false;
       this.resetForm();
@@ -1638,14 +1634,14 @@ export default {
       }
     },
 
-    append(data,formName){//新增 编辑
+    append(data, formName) {//新增 编辑
       this.formName = formName;
       if (formName === "edit") {
         this.subData = JSON.parse(JSON.stringify(data));
-        this.subData.name= JSON.parse(JSON.stringify(data.label));
-      }else if(formName === "add"){
-        this.subData= {
-          parentCode:JSON.parse(JSON.stringify(data)).code
+        this.subData.name = JSON.parse(JSON.stringify(data.label));
+      } else if (formName === "add") {
+        this.subData = {
+          parentCode: JSON.parse(JSON.stringify(data)).code
         };
       }
       this.getTreeselect(data);
@@ -1654,17 +1650,17 @@ export default {
 
     /** 查询菜单下拉树结构 */
     getTreeselect(row) {
-      if(row!=null){
-        var data={
-          code:row.code,
-          type:1
+      if (row != null) {
+        var data = {
+          code: row.code,
+          type: 1
         }
       }
-      getOneName().then(res =>{
-        const menu = {id: res.data.id,code:res.data.code, name: res.data.name, children: []};
+      getOneName().then(res => {
+        const menu = {id: res.data.id, code: res.data.code, name: res.data.name, children: []};
         getListMenu(data).then(response => {
           this.fromDeptOptions = [];
-          menu.children = this.handleTree(response.data,"code", "parentCode");
+          menu.children = this.handleTree(response.data, "code", "parentCode");
           console.log(menu)
           this.fromDeptOptions.push(menu);
           console.log(this.fromDeptOptions)
@@ -1729,7 +1725,7 @@ export default {
   mounted() {
   },
   components: {
-    Treeselect,selectProduct,
+    Treeselect, selectProduct,
   },
   created() {
     this.getList();
@@ -1751,6 +1747,7 @@ export default {
       height: 100%;
       align-items: start;
     }
+
     .el-tree-node:focus > .el-tree-node__content {
       background-color: rgb(158, 213, 250) !important;
     }
diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue
index a19f372c..3cdb0a9b 100644
--- a/src/views/purchase/purApply/purOrderSelectProduct.vue
+++ b/src/views/purchase/purApply/purOrderSelectProduct.vue
@@ -64,19 +64,22 @@
 
         <el-row>
           <el-col :span="6">
-            <el-form-item label="类别编码:" class="query-form-item">
-              <el-input v-model="listQuery.category" style="width: 100%" placeholder="请输入类别编码" clearable="true"></el-input>
+            <el-form-item label="物资分类:" class="query-form-item">
+              <el-input v-model="listQuery.category" style="width: 100%" placeholder="请输入物资分类名称"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6" v-if="productRemarkSet.remarkEnable1">
             <el-form-item :label="productRemarkSet.remarkTitle1+':'" class="query-form-item">
-              <el-input v-model="listQuery.basicPrductRemak1" style="width: 100%" :placeholder="productRemarkSet.remarkTitle1"
+              <el-input v-model="listQuery.basicPrductRemak1" style="width: 100%"
+                        :placeholder="productRemarkSet.remarkTitle1"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6" v-if="productRemarkSet.remarkEnable2">
             <el-form-item :label="productRemarkSet.remarkTitle2 +':'" class="query-form-item">
-              <el-input v-model="listQuery.basicPrductRemak2" style="width: 100%" :placeholder="productRemarkSet.remarkTitle2"
+              <el-input v-model="listQuery.basicPrductRemak2" style="width: 100%"
+                        :placeholder="productRemarkSet.remarkTitle2"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>

From c6025a5c4e6475cce846e9ec3f91b6684a2d2b39 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 27 Jun 2023 09:08:16 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.production b/.env.production
index 41898042..d4bcb835 100644
--- a/.env.production
+++ b/.env.production
@@ -8,7 +8,7 @@ ENV = 'production'
 
 
 #林纪裕cd
-VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/'
 
 # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
 
@@ -25,7 +25,7 @@ VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/'
 # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
 
 # 平潭正式
-# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 # 吴总测试服务器
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'

From ad9baf08aca20ad9cbb79638b01ef2e0af38bcdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 27 Jun 2023 10:50:43 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E5=87=BA=E5=BA=93bug?=
 =?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/basic/product/productEdit.vue        | 4 ++--
 src/views/inout/muti/ioOrderMutiEditDialog.vue | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 96027f24..ecc08958 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -345,7 +345,7 @@
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
                 <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="!editQuery.useMuti"
-                          type="number" v-model="editQuery.zdcfsycs"></el-input>
+                          type="number" v-model="editQuery.useNum"></el-input>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
@@ -872,7 +872,7 @@ export default {
     },
     setZdcfsycs(){
       if(this.editQuery.useMuti==false){
-        this.editQuery.zdcfsycs=0;
+        this.editQuery.useNum=0;
       }
     },
     /** 转换菜单数据结构 */
diff --git a/src/views/inout/muti/ioOrderMutiEditDialog.vue b/src/views/inout/muti/ioOrderMutiEditDialog.vue
index 6f19adb1..f20636b3 100644
--- a/src/views/inout/muti/ioOrderMutiEditDialog.vue
+++ b/src/views/inout/muti/ioOrderMutiEditDialog.vue
@@ -223,6 +223,11 @@ export default {
               this.inputQuery.ggxh = response.data.data.ggxh
               this.inputQuery.totalCount = response.data.data.totalCount
               this.inputQuery.useCount = response.data.data.useCount
+              if(this.inputQuery.mark!=null){
+                this.formName=2
+                this.inputQuery.mark = response.data.data.mark
+              }
+              this.detailList=response.data.detailList;
               this.$refs.fromCorpInputRef.focus();
             } else {
               this.$message.error(response.message);

From 53e1977b9017d52b0377fb978f9d2eb7e75c75e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 27 Jun 2023 15:38:18 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E7=94=B3=E8=B4=AD=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/purApply/purApplyEditDiaolog.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index bf8ce623..a70d12ca 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -114,7 +114,6 @@
               <el-input size="small" v-model="scope.row.count"
                         placeholder="请输入数量" style="width: 80%"
                         type='number'
-                        @change="tableCountChange(scope.row)"
                         :disabled="scope.row.index !== selectedIndex"
                         oninput="value=value.replace(/[^\d]/g,'')"></el-input>
             </template>
@@ -127,6 +126,9 @@
               <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
                          @click.native="rowChange(scope.row)">编辑
               </el-button>
+              <el-button type="text" size="small" :disabled="scope.row.index !== selectedIndex" @click.stop="true"
+                         @click.native="tableCountChange(scope.row)">保存
+              </el-button>
               <el-button type="text" size="small" @click.stop="true"
                          @click.native="deleteCodeArray(scope.$index, scope.row)">删除
               </el-button>
@@ -397,6 +399,7 @@ export default {
     tableCountChange(row) {
       if (this.$isNotBlank(row)) {
         updateDetail(this.currentRow);
+        this.selectedIndex=""
       }
     },
     tableRowClassName({row, rowIndex}) {

From 4f8397fcb908a52d0263f019bb2cf3cd810d2a62 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 27 Jun 2023 18:35:32 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=A2=84=E8=A7=88bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 97de905cc96e123a48ed3304cf7ce5360d71f0c2)
---
 src/views/inout/DialogCheck.vue         | 6 ++++++
 src/views/inout/IoAuditedOrder.vue      | 6 ++++++
 src/views/inout/IoCheckAuditOrder.vue   | 6 ++++++
 src/views/inout/IoCheckSuccessOrder.vue | 6 ++++++
 4 files changed, 24 insertions(+)

diff --git a/src/views/inout/DialogCheck.vue b/src/views/inout/DialogCheck.vue
index 4912f568..fb8bf616 100644
--- a/src/views/inout/DialogCheck.vue
+++ b/src/views/inout/DialogCheck.vue
@@ -455,6 +455,9 @@ export default {
       return isJPG || isPNG;
     },
     showImgViewer(row) {
+      if(this.inputQuery.filePath.substr(-1) == ','){
+        this.inputQuery.filePath=this.inputQuery.filePath.slice(0, this.inputQuery.filePath.length-1);
+      }
       this.certFileUrl =
         this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.filePath;
@@ -493,6 +496,9 @@ export default {
     },
 
     showImgViewerCold(row){
+      if(this.inputQuery.coldFilePath.substr(-1) == ','){
+        this.inputQuery.coldFilePath=this.inputQuery.coldFilePath.slice(0, this.inputQuery.coldFilePath.length-1);
+      }
       this.certFileUrl =
         this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.coldFilePath;
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index b741b13b..621f5f75 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -654,6 +654,9 @@ export default {
       this.getList();
     },
     showImgViewer(row) {
+      if(row.filePath.substr(-1) == ','){
+        row.filePath=row.filePath.slice(0, row.filePath.length-1);
+      }
       this.certFileUrl =
         this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
@@ -693,6 +696,9 @@ export default {
 
 
     showImgViewerCold(row) {
+      if(row.coldFilePath.substr(-1) == ','){
+        row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
+      }
       this.certFileUrl =
         this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index c8bf5c47..6e2bd66c 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@@ -753,6 +753,9 @@ export default {
       this.showSearch = !this.showSearch;
     },
     showImgViewer(row) {
+      if(row.filePath.substr(-1) == ','){
+        row.filePath=row.filePath.slice(0, row.filePath.length-1);
+      }
       this.certFileUrl =
         this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
@@ -791,6 +794,9 @@ export default {
     },
 
     showImgViewerCold(row) {
+      if(row.coldFilePath.substr(-1) == ','){
+        row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
+      }
       this.certFileUrl =
         this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index b2eec70b..9d317f6e 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -620,6 +620,9 @@ export default {
     },
 
     showImgViewer(row) {
+      if(row.filePath.substr(-1) == ','){
+        row.filePath=row.filePath.slice(0, row.filePath.length-1);
+      }
       this.certFileUrl =
         this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
@@ -658,6 +661,9 @@ export default {
     },
 
     showImgViewerCold(row) {
+      if(row.coldFilePath.substr(-1) == ','){
+        row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
+      }
       this.certFileUrl =
         this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;

From 9ff096566cfbd6ccee0b7e49ad1188de2c0232dc Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 28 Jun 2023 09:22:32 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/uploadManage/uploadSetting.vue | 4 ++++
 src/views/thirdSys/api/DialogEditBusDown.vue   | 2 +-
 src/views/thirdSys/api/DialogEditBusUpload.vue | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/inout/uploadManage/uploadSetting.vue b/src/views/inout/uploadManage/uploadSetting.vue
index a346e122..a46515c8 100644
--- a/src/views/inout/uploadManage/uploadSetting.vue
+++ b/src/views/inout/uploadManage/uploadSetting.vue
@@ -330,6 +330,10 @@ export default {
     },
     addBusType() {
       let selectedData = this.multipleSelection;
+
+      selectedData.forEach(item => {
+        item.id = null
+      });
       this.addBusDialogVisible = false;
       let query = {
         busTypes: selectedData,
diff --git a/src/views/thirdSys/api/DialogEditBusDown.vue b/src/views/thirdSys/api/DialogEditBusDown.vue
index 97837bec..44d8f451 100644
--- a/src/views/thirdSys/api/DialogEditBusDown.vue
+++ b/src/views/thirdSys/api/DialogEditBusDown.vue
@@ -35,7 +35,7 @@
                 :value="item.action">
                 <span style="float: left;font-size: 13px">{{ item.name }}</span>
                 <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
-                    item.remark
+                    item.action
                   }}</span>
               </el-option>
             </el-select>
diff --git a/src/views/thirdSys/api/DialogEditBusUpload.vue b/src/views/thirdSys/api/DialogEditBusUpload.vue
index 2ff051db..3be68aee 100644
--- a/src/views/thirdSys/api/DialogEditBusUpload.vue
+++ b/src/views/thirdSys/api/DialogEditBusUpload.vue
@@ -35,7 +35,7 @@
                 :value="item.action">
                 <span style="float: left;font-size: 13px">{{ item.name }}</span>
                 <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
-                    item.remark
+                    item.action
                   }}</span>
               </el-option>
             </el-select>

From e713afdd3a3b25755d8c11286c4d1be2fa305482 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 3 Jul 2023 14:12:23 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8A=E4=BC=A0=E8=BF=87=E6=BB=A4=EF=BC=8C=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8A=E4=BC=A0=E6=96=B0=E5=A2=9E=E8=B5=B7=E5=A7=8B?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/IoAuditedOrder.vue            | 50 ++++++-------
 src/views/inout/uploadManage/uploadOrder.vue  | 71 +++++++++++++++----
 .../inout/uploadManage/uploadSetting.vue      | 20 +++++-
 3 files changed, 103 insertions(+), 38 deletions(-)

diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index 621f5f75..573dde03 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -110,7 +110,7 @@
                 :default-sort="defaultSort"
                 @sort-change="handleSortChange">
         <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="billNo" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
         <el-table-column label="往来单位" prop="fromName" width="220">
         </el-table-column>
@@ -133,11 +133,11 @@
         </el-table-column>
 
 
-        <el-table-column label="采购仓库" prop="deptName" width="120">
+        <el-table-column label="所属部门" prop="deptName" width="120">
         </el-table-column>
-        <el-table-column label="审核人" prop="reviewUserName" width="120">
+        <el-table-column label="所属仓库" prop="invName" width="120">
         </el-table-column>
-        <el-table-column label="收货仓库" prop="invName" width="120">
+        <el-table-column label="审核人" prop="reviewUserName" width="120">
         </el-table-column>
         <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="来源" prop="fromType" width="120">
@@ -169,14 +169,14 @@
             <!--            >报表打印-->
             <!--            </el-button-->
             <!--            >-->
-<!--            暂时隐藏-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              @click.native.stop="rollback(scope.row)"-->
-<!--            >撤回-->
-<!--            </el-button-->
-<!--            >-->
+            <!--            暂时隐藏-->
+            <!--            <el-button-->
+            <!--              type="text"-->
+            <!--              size="small"-->
+            <!--              @click.native.stop="rollback(scope.row)"-->
+            <!--            >撤回-->
+            <!--            </el-button-->
+            <!--            >-->
 
             <el-button
               type="text"
@@ -465,7 +465,7 @@ import DialogcChangeNewOrder from "@/views/inout/DialogcChangeNewOrder";
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 import DialogCheck from "@/views/inout/DialogCheck";
 import {getBizDetailList} from "@/api/inout/orderDetailBiz";
-import {previewImage,previewFile} from "@/api/purchase/supCompany";
+import {previewImage, previewFile} from "@/api/purchase/supCompany";
 import {
   inspectionStockQRCodeTextPDFFromTemplateStatementFile,
   stockQRCodeTextPDFFromTemplateStatementFile
@@ -654,23 +654,23 @@ export default {
       this.getList();
     },
     showImgViewer(row) {
-      if(row.filePath.substr(-1) == ','){
-        row.filePath=row.filePath.slice(0, row.filePath.length-1);
+      if (row.filePath.substr(-1) == ',') {
+        row.filePath = row.filePath.slice(0, row.filePath.length - 1);
       }
       this.certFileUrl =
         this.BASE_URL +
-        "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
+        "/udiwms/image/register/file/getImage?type=image2&name=" + row.filePath;
       this.imgList = [];
       this.imgList.push(this.certFileUrl)
       let index = row.filePath.lastIndexOf('.');
-      if(index===-1){
+      if (index === -1) {
         this.$message.error("文件名异常!")
         return false
       }
-      if(row.filePath.substr(index+1)==='pdf'){
+      if (row.filePath.substr(index + 1) === 'pdf') {
         let pdf = "application/pdf"
         let binaryData = [];
-        previewFile(this.certFileUrl).then(res=>{
+        previewFile(this.certFileUrl).then(res => {
           binaryData.push(res);
           let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
           window.open(URL);
@@ -696,23 +696,23 @@ export default {
 
 
     showImgViewerCold(row) {
-      if(row.coldFilePath.substr(-1) == ','){
-        row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
+      if (row.coldFilePath.substr(-1) == ',') {
+        row.coldFilePath = row.coldFilePath.slice(0, row.coldFilePath.length - 1);
       }
       this.certFileUrl =
         this.BASE_URL +
-        "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
+        "/udiwms/image/register/file/getImage?type=image2&name=" + row.coldFilePath;
       this.imgList = [];
       this.imgList.push(this.certFileUrl)
       let index = row.coldFilePath.lastIndexOf('.');
-      if(index===-1){
+      if (index === -1) {
         this.$message.error("文件名异常!")
         return false
       }
-      if(row.coldFilePath.substr(index+1)==='pdf'){
+      if (row.coldFilePath.substr(index + 1) === 'pdf') {
         let pdf = "application/pdf"
         let binaryData = [];
-        previewFile(this.certFileUrl).then(res=>{
+        previewFile(this.certFileUrl).then(res => {
           binaryData.push(res);
           let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
           window.open(URL);
diff --git a/src/views/inout/uploadManage/uploadOrder.vue b/src/views/inout/uploadManage/uploadOrder.vue
index 5f5dd633..e5cccb6d 100644
--- a/src/views/inout/uploadManage/uploadOrder.vue
+++ b/src/views/inout/uploadManage/uploadOrder.vue
@@ -99,25 +99,49 @@
                 @current-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
-        <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
-        <el-table-column label="来源" prop="fromType">
+        <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>
+        <el-table-column label="往来单位" prop="fromName" width="220">
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"
+                         sortable="custom"
+                         :sort-orders="['ascending', 'descending']">
           <template slot-scope="scope">
-            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="往来单位" prop="fromCorpName" width="220">
+
+        <el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150"
+                         sortable="custom"
+                         :sort-orders="['ascending', 'descending']">
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.auditTime }}</span>
+          </template>
         </el-table-column>
-        <el-table-column label="当前部门" prop="deptName" width="120">
+
+
+        <el-table-column label="所属部门" prop="deptName" width="120">
         </el-table-column>
-        <el-table-column label="当前仓库" prop="invName" width="120">
+        <el-table-column label="所属仓库" prop="invName" width="120">
         </el-table-column>
-        <el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">
+
+        <el-table-column label="审核人" prop="reviewUserName" width="120">
         </el-table-column>
-        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
+
+        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="来源" prop="fromType" width="120">
           <template slot-scope="scope">
-            <i class="el-icon-time"></i>
-            <span>{{ scope.row.createTime }}</span>
+            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核状态" prop="status" width="100">
+          <template slot-scope="scope">
+            <el-tag :type="statusAuditFilterType(scope.row.status)">{{
+                checkStatus[scope.row.status]
+              }}
+            </el-tag>
           </template>
         </el-table-column>
         <el-table-column label="提交状态" prop="exportStatus" width="100">
@@ -345,6 +369,7 @@ export default {
         endTime: null,
         billNo: null,
         submitStatus: null,
+        vueType: "thirdUpload",
         page: 1,
         limit: 10
       },
@@ -436,6 +461,17 @@ export default {
         1: "已提交",
         2: "提交失败"
       },
+      checkStatus: {
+        1: "草稿",
+        2: "等待处理",
+        3: "等待校验",
+        4: "处理异常",
+        5: "待核对",
+        6: "校验异常",
+        7: "已审核",
+        8: "审核拒绝",
+        9: "正在处理", 10: "待审核", 11: "待配货",
+      },
       loading: false,
       list: [],
       total: 0,
@@ -472,13 +508,14 @@ export default {
         corpName: null,
         invCode: this.$store.getters.locInvCode,
         startTime: null,
+        vueType: "thirdUpload",
         endTime: null,
         billNo: null,
         submitStatus: null,
         page: 1,
         limit: 10
       };
-      this.actDateRange= [];
+      this.actDateRange = [];
       this.getList();
     },
     onSubmit() {
@@ -633,6 +670,7 @@ export default {
     getBusType() {
       let params = {
         code: this.filterQuery.invCode,
+        vueType: "thirdUpload",
         enabled: true
       };
       getLocalJoinByUser(params).then((res) => {
@@ -640,6 +678,15 @@ export default {
         this.onSubmit();
       });
     },
+    statusAuditFilterType(status) {
+      const statusMap = {
+        5: "warning",
+        1: "warning",
+        6: "danger",
+        7: "success",
+      };
+      return statusMap[status];
+    },
   },
   filters: {
     statusFilterType(status) {
diff --git a/src/views/inout/uploadManage/uploadSetting.vue b/src/views/inout/uploadManage/uploadSetting.vue
index a46515c8..07fdf134 100644
--- a/src/views/inout/uploadManage/uploadSetting.vue
+++ b/src/views/inout/uploadManage/uploadSetting.vue
@@ -30,7 +30,6 @@
           <template slot="label">
             参数设置
           </template>
-
           <el-row :gutter="20" class="el-row">
             <el-col :span="20" class="el-col">
               <div>
@@ -43,7 +42,26 @@
                   :disabled="configQuery.autoUpload"
                   splaceholder="请输入内容"
                 ></el-input>
+              </div>
+            </el-col>
+          </el-row>
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            参数设置
+          </template>
 
+          <el-row :gutter="20" class="el-row">
+            <el-col :span="20" class="el-col">
+              <div>
+                <span>单据上传起始时间:&nbsp;</span>
+                <el-date-picker
+                  v-model="configQuery.orderStartTime"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  :disabled="configQuery.autoUpload"
+                  placeholder="单据上传起始时间">
+                </el-date-picker>
               </div>
             </el-col>
           </el-row>

From f478762ee24e3c2890f4533bc463c4d1d60e3d65 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 5 Jul 2023 14:15:18 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=B3=E8=B4=AD?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/purApply/pureApplySearch.vue     | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/views/purchase/purApply/pureApplySearch.vue b/src/views/purchase/purApply/pureApplySearch.vue
index 302e4e22..014db9dc 100644
--- a/src/views/purchase/purApply/pureApplySearch.vue
+++ b/src/views/purchase/purApply/pureApplySearch.vue
@@ -11,7 +11,7 @@
 
           <el-col :span="8">
             <el-form-item label="申购部门">
-              <el-select v-model="filterQuery.targetDeptCode" @change="getInvList" placeholder="请选择申购部门" style="width: 90%">
+              <el-select v-model="filterQuery.deptCode" @change="getInvList" placeholder="请选择申购部门" style="width: 90%">
                 <el-option
                   v-for="item in deptList"
                   :key="item.code"
@@ -25,7 +25,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="申购仓库">
-              <el-select v-model="filterQuery.targetInvCode" style="width: 90%" clearable placeholder="请选择所属仓库">
+              <el-select v-model="filterQuery.invCode" style="width: 90%" clearable placeholder="请选择所属仓库">
                 <el-option
                   v-for="item in invList"
                   :key="item.name"
@@ -92,22 +92,23 @@
       </div>
       <el-divider style="margin: 15px"></el-divider>
 
-      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row @current-change="handleDetail"
-                :default-sort="defaultSort"  @sort-change="handleSortChange">
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
+                @current-change="handleDetail"
+                :default-sort="defaultSort" @sort-change="handleSortChange">
         <el-table-column label="序号" type="index" width="60"></el-table-column>
         <el-table-column label="申购单号" prop="billNo"></el-table-column>
         <el-table-column label="申购部门" prop="targetDeptName"></el-table-column>
         <el-table-column label="申购仓库" prop="targetInvName"></el-table-column>
-        <el-table-column label="紧急程度" prop="emergency" >
+        <el-table-column label="紧急程度" prop="emergency">
           <template slot-scope="scope">
             {{ emergencyMap[scope.row.emergency] }}
           </template>
         </el-table-column>
-        <el-table-column label="到货截止" prop="arrivalTime" ></el-table-column>
+        <el-table-column label="到货截止" prop="arrivalTime"></el-table-column>
         <el-table-column label="创建时间" prop="createTime"
-                         sortable="custom" :sort-orders="['ascending', 'descending']" ></el-table-column>
+                         sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
         <el-table-column label="审核时间" prop="auditTime"
-                         sortable="custom" :sort-orders="['ascending', 'descending']"  ></el-table-column>
+                         sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
         <el-table-column label="审核人" prop="auditByName"></el-table-column>
 
         <el-table-column label="审核状态" prop="status">
@@ -188,8 +189,9 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
-        emergency:'',
-        targetDeptCode:'',
+        emergency: '',
+        deptCode: '',
+        invCode: null,
       },
       formName: null,
       formMap: {
@@ -202,7 +204,7 @@ export default {
         3: "已审核",
         4: "已拒绝"
       },
-      emergencyMap:{
+      emergencyMap: {
         1: "正常",
         2: "较急",
         3: "特急",
@@ -211,12 +213,12 @@ export default {
       editType: 2,
       total: 0,
       thirdSys: [],
-      invCodebe:null,
+      invCodebe: null,
       thirdSysDetail: null,
       busTypes: [],
       originTypes: [],
-      invList:{},
-      deptList:{},
+      invList: {},
+      deptList: {},
       list: [],
       detailList: [],
       loading: false,
@@ -295,7 +297,7 @@ export default {
       this.$router.push({
         path: "",
       });
-      let deptCode = this.filterQuery.targetDeptCode
+      let deptCode = this.filterQuery.deptCode
       this.filterQuery = {
         billNo: "",
         thirdSysFk: "",
@@ -308,9 +310,9 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
-        targetDeptCode: this.invCodebe,
+        deptCode: this.invCodebe,
       };
-      if(deptCode!=this.invCodebe){
+      if (deptCode != this.invCodebe) {
         this.getInvList()
       }
       this.actDateRange = [];
@@ -358,7 +360,7 @@ export default {
           if (response.code == 20000) {
             this.list = response.data.list || [];
             this.total = response.data.total || 0;
-            this.detailList=[]
+            this.detailList = []
           } else {
             this.$message.error(response.message);
           }
@@ -452,8 +454,8 @@ export default {
       this.newSpDistributionVisible = true;
     },
     getInvList() {
-      var query={
-        parentId:this.filterQuery.targetDeptCode
+      var query = {
+        parentId: this.filterQuery.targetDeptCode
       }
       filterSubAll(query).then((res) => {
         this.invList = res.data || [];
@@ -462,12 +464,12 @@ export default {
     getDeptList() {
       getDeptListByUser().then((res) => {
         this.deptList = res.data || [];
-        if(this.deptList.length>0){
-          this.filterQuery.targetDeptCode=this.deptList[0].code
-          this.invCodebe=this.filterQuery.targetDeptCode
+        if (this.deptList.length > 0) {
+          this.filterQuery.targetDeptCode = this.deptList[0].code
+          this.invCodebe = this.filterQuery.targetDeptCode
         }
         this.getList();
-        this. getInvList();
+        this.getInvList();
       });
     },
   }

From 25f5cc3f062ce20994238362b027e11af500d5f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 5 Jul 2023 14:35:03 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E5=AE=9A=E9=80=9F=E5=8C=85=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/basicDestinyRel.js              |  88 ++++
 src/api/inout/ioDestinyProcess.js             |  58 +++
 src/views/basic/destiny/addDestinyProcess.vue | 455 ++++++++++++++++++
 src/views/basic/destiny/destiny.vue           | 263 ++++++++++
 src/views/basic/destiny/destinyModel.vue      | 145 ++++++
 src/views/basic/destiny/destinyModelEdit.vue  | 113 +++++
 .../destiny/destinyModelSelectProduct.vue     | 222 +++++++++
 src/views/basic/destiny/destinyProcess.vue    | 265 ++++++++++
 .../basic/destiny/destinyProcessCode.vue      | 101 ++++
 .../basic/destiny/destinyProcessDelect.vue    |  97 ++++
 .../basic/destiny/destinySelectProduct.vue    | 339 +++++++++++++
 src/views/basic/product/bindProduct.vue       |   1 -
 src/views/basic/product/productCategory.vue   |   1 -
 .../userManage/bindPlatformEditModel.vue      |   1 -
 14 files changed, 2146 insertions(+), 3 deletions(-)
 create mode 100644 src/api/basic/basicDestinyRel.js
 create mode 100644 src/api/inout/ioDestinyProcess.js
 create mode 100644 src/views/basic/destiny/addDestinyProcess.vue
 create mode 100644 src/views/basic/destiny/destiny.vue
 create mode 100644 src/views/basic/destiny/destinyModel.vue
 create mode 100644 src/views/basic/destiny/destinyModelEdit.vue
 create mode 100644 src/views/basic/destiny/destinyModelSelectProduct.vue
 create mode 100644 src/views/basic/destiny/destinyProcess.vue
 create mode 100644 src/views/basic/destiny/destinyProcessCode.vue
 create mode 100644 src/views/basic/destiny/destinyProcessDelect.vue
 create mode 100644 src/views/basic/destiny/destinySelectProduct.vue

diff --git a/src/api/basic/basicDestinyRel.js b/src/api/basic/basicDestinyRel.js
new file mode 100644
index 00000000..f8b24261
--- /dev/null
+++ b/src/api/basic/basicDestinyRel.js
@@ -0,0 +1,88 @@
+import axios from "@/utils/request";
+
+export function getBasicDestinyfilter(query) {
+    return axios({
+        url: "/udiwms/basic/destiny/model/filter",
+        method: "get",
+        params: query
+    });
+}
+
+export function addModeldestiny(query) {
+    return axios({
+        url: "/udiwms/basic/destiny/model/addModeldestiny",
+        method: "post",
+        data: query
+    });
+}
+
+export function editModeldestiny(query) {
+    return axios({
+        url: "/udiwms/basic/destiny/model/editModeldestiny",
+        method: "post",
+        data: query
+    });
+}
+
+export function delectModeldestiny(query) {
+    return axios({
+        url: "/udiwms/basic/destiny/model/delectModeldestiny",
+        method: "post",
+        data: query
+    });
+}
+
+export function filterDestinyProduct(query) {
+    return axios({
+        url: "/udiwms/basic/destiny/model/product/filter",
+        method: "get",
+        params: query
+    });
+}
+
+export function addModeldestinyProduct(query) {
+    return axios({
+        url: "/udiwms/basic/destiny/model/addModeldestinyProduct",
+        method: "post",
+        data: query
+    });
+}
+
+
+export function filterDestinyDelect(query) {
+    return axios({
+        url: "/udiwms/basic/destiny/model/filterDestinyDelect",
+        method: "get",
+        params: query
+    });
+}
+
+export function delectModeldestinyProduct(query) {
+    return axios({
+        url: "/udiwms/basic/destiny/model/delectModeldestinyProduct",
+        method: "get",
+        params: query
+    });
+}
+
+export function uploadModeldestinyProduct(query) {
+    return axios({
+        url: "/udiwms/basic/destiny/model/uploadModeldestinyProduct",
+        method: "post",
+        data: query
+    });
+}
+
+export function addDestinyProcess(query) {
+    return axios({
+        url: "/udiwms/basic/destiny/model/addDestinyProcess",
+        method: "get",
+        params: query
+    });
+}
+
+
+
+
+
+
diff --git a/src/api/inout/ioDestinyProcess.js b/src/api/inout/ioDestinyProcess.js
new file mode 100644
index 00000000..2f0e421b
--- /dev/null
+++ b/src/api/inout/ioDestinyProcess.js
@@ -0,0 +1,58 @@
+import axios from '@/utils/request'
+
+
+export function addDestinyDelect(query) {
+    return axios({
+        url: "/udiwms/basic/destiny/model/addDestinyDelect",
+        method: "post",
+        data: query
+    });
+}
+
+export function filterDestinyDelect(query) {
+    return axios({
+        url: "/udiwms/basic/destiny/model/filterDestinyProcessDelect",
+        method: "get",
+        params: query
+    });
+}
+
+export function filterDestinyProcess(query) {
+    return axios({
+        url: "/udiwms/basic/destiny/model/filterDestinyProcess",
+        method: "get",
+        params: query
+    });
+}
+
+export function checkDestinyProcess(query) {
+    return axios({
+        url: "/udiwms/basic/destiny/model/checkDestinyProcess",
+        method: "get",
+        params: query
+    });
+}
+
+
+export function filterDestinyProcessCode(query) {
+    return axios({
+        url: "/udiwms/basic/destiny/model/filterDestinyProcessCode",
+        method: "get",
+        params: query
+    });
+}
+
+
+export function delectDestinyProcess(query) {
+    return axios({
+        url: "/udiwms/basic/destiny/model/delectDestinyProcess",
+        method: "get",
+        params: query
+    });
+}
+
+
+
+
+
+
diff --git a/src/views/basic/destiny/addDestinyProcess.vue b/src/views/basic/destiny/addDestinyProcess.vue
new file mode 100644
index 00000000..f30db7a3
--- /dev/null
+++ b/src/views/basic/destiny/addDestinyProcess.vue
@@ -0,0 +1,455 @@
+<template>
+  <div>
+    <el-card>
+      <el-button-group style="display: flex">
+        <el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px"
+                   :loading="loading">提交
+        </el-button>
+      </el-button-group>
+      <el-form :model="filterQuery" class="query-form" size="mini" label-width="120px" v-show="showSearch">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="唯一编码:">
+              <el-input v-model="filterQuery.destinyNo" :disabled="true" placeholder="请输入唯一编码"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="单据号:">
+              <el-input v-model="filterQuery.billNo" :disabled="true" placeholder="请输入单据号" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="单据时间:">
+              <el-input v-model="filterQuery.billDate" :disabled="true" placeholder="请输入单据时间"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="当前仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="当前仓库" filterable style="width: 100%" clearable>
+                <el-option
+                    v-for="item in invList"
+                    :key="item.code"
+                    :label="item.name"
+                    :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="备注:">
+              <el-input v-model="filterQuery.remark" placeholder="请输入当前仓库" clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="18">
+            <el-form-item class="query-form-item" label="扫码录入:">
+              <el-input
+                  id="inputer"
+                  @focus="getInputFocus($event)"
+                  @keypress.enter.native="addCode($event)"
+                  ref='inputRef'
+                  style="ime-mode:disabled"
+                  type="tel"
+                  v-model="filterQuery.code"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <el-button
+                type="primary"
+                size="mini"
+                @click.native.stop="addCode()"
+                style="margin-left: 15px"
+            >添加
+            </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button type="primary" icon="el-icon-plus" @click="addDestiny">选入定数包</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+
+
+      <el-tabs type="border-card" style="margin-top: 50px">
+        <el-tab-pane label="定数包详情">
+          <destiny-process-delect
+              :billNo="this.filterQuery.billNo"
+              :destinyProcessCodeShow="destinyProcessDelectShow"
+              v-if="destinyProcessDelectShow"
+          ></destiny-process-delect>
+        </el-tab-pane>
+        <el-tab-pane label="扫码详情">
+          <destiny-process-code
+              :billNo="this.filterQuery.billNo"
+              :destinyProcessCodeShow="destinyProcessCodeShow"
+              v-if="destinyProcessCodeShow"
+          ></destiny-process-code>
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
+    <el-dialog
+        title="选入定数包"
+        :visible.sync="orderMutiVisible"
+        :before-close="close"
+        width="60%"
+        append-to-body
+        v-if="orderMutiVisible"
+        @close='closeDialog'
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+    >
+      <destinyModel
+          :closeDialog="closeDialog"
+      ></destinyModel>
+    </el-dialog>
+
+  </div>
+</template>
+
+
+<script>
+import destinyModel from "@/views/basic/destiny/destinyModel";
+import {delectMuti, detailMuti, filterList, selectMutiDetailList, selectMutiList} from "@/api/inout/orderMuti";
+import {parseTime} from "@/utils/coTools";
+import destinyProcessCode from "@/views/basic/destiny/destinyProcessCode";
+import destinyProcessDelect from "@/views/basic/destiny/destinyProcessDelect";
+import {findInvByUser} from "@/api/system/invSubWarehouse";
+import {addDestinyDelect, checkDestinyProcess} from "@/api/inout/ioDestinyProcess";
+import {addDestinyProcess} from "@/api/basic/basicDestinyRel";
+import {delCorps} from "@/api/thrsys/thrCorps";
+
+
+export default {
+  name: "ioOrderMuti",
+  props: {
+    editQuery: {
+      type: Object,
+      required: true
+    },
+    closeDialogpr: {
+      type: Function,
+      required: true,
+    }
+  },
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        destinyNo: '',
+        billNo: null,
+        billDate: null,
+        invCode: null,
+        remark: null,
+        code: null,
+        status: 0,
+        page: 1,
+        limit: 10,
+      },
+      inputQuery: {
+        curInv: null,
+        fromCorp: "",
+        targetAction: null,
+        remark: null,
+        updateTime: null,
+      },
+      total: 0,
+      loading: false,
+      list: [],
+      formName: 1,
+      destinyProcessCodeShow: false,
+      destinyProcessDelectShow: false,
+      formMap: {
+        1: "新增使用出库",
+        2: "编辑使用出库",
+      },
+      statusMap: {
+        0: "草稿",
+        1: "未审核",
+      },
+      invList: [],
+      orderMutiVisible: false,
+      destinyId: null,
+      actDateRange: [],
+      detailList: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "warning",
+        2: "danger",
+        3: "success",
+      };
+      return statusMap[status];
+    },
+    onReset() {
+      this.filterQuery = {
+        udiCode: null,
+        orderIdFk: null,
+        relIdFk: null,
+        mark: null,
+        status: 0,
+        cpmctymc: null,
+        page: 1,
+        limit: 10,
+      }
+      this.actDateRange = []
+      this.getList();
+      this.detailList = []
+    },
+    onSubmit() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    closeDialog(row) {
+      this.destinyId = row;
+      var query = {
+        destinyNo: this.filterQuery.destinyNo,
+        billNo: this.filterQuery.billNo,
+        billDate: this.filterQuery.billDate,
+        invCode: this.filterQuery.invCode,
+        remark: this.filterQuery.remark,
+        destinyId: this.destinyId,
+      }
+      addDestinyDelect(query).then((response) => {
+        if (response.code == 20000) {
+          this.orderMutiVisible = false;
+          this.destinyProcessDelectShow = false;
+          this.destinyProcessCodeShow = false;
+          this.$nextTick(() => {
+            this.destinyProcessCodeShow = true;
+            this.destinyProcessDelectShow = true;
+          });
+        } else {
+          this.$message.error(response.message);
+        }
+      }).catch(() => {
+        this.$message.error(response.message);
+      });
+
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getInputFocus(event) {
+      event.currentTarget.select();
+    },
+    addDestiny() {
+      if (this.filterQuery.invCode == null) {
+        this.$message.error("请先选择当前仓库！");
+        return
+      }
+      if (this.destinyProcessCodeShow == true) {
+        this.$confirm("此操作将永久删除扫码信息, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          this.orderMutiVisible = true;
+        })
+      }else{
+        this.orderMutiVisible = true;
+      }
+    },
+    editDialog(row) {
+      this.formName = 2;
+      this.inputQuery = row;
+      this.orderMutiVisible = true;
+    }
+    ,
+    getList() {
+      if (this.actDateRange != null) {
+        this.filterQuery.startDate = this.actDateRange[0];
+        this.filterQuery.endDate = this.actDateRange[1];
+      } else {
+        this.filterQuery.startDate = null;
+        this.filterQuery.endDate = null;
+      }
+      this.loading = true;
+      selectMutiList(this.filterQuery)
+          .then((response) => {
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+            this.detailList = []
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    }
+    ,
+    deleteDialog(row) {
+      delectMuti(row)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.getList()
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.$message.error(response.message);
+          });
+    }
+    ,
+    handleDetail(row) {
+      selectMutiDetailList({mutiIdFk: row.id}).then((response) => {
+        if (response.code == 20000) {
+          this.detailList = response.data || [];
+          this.inputQuery.useCount = this.detailList.length
+        }
+      })
+    }
+    ,
+    addCode() {
+      if (this.filterQuery.invCode == null) {
+        this.$message.error("请先选择当前仓库！");
+        return
+      }
+      if (this.filterQuery.code == null) {
+        this.$message.error("请先扫码！");
+        return
+      }
+      var query = {
+        code: this.filterQuery.code,
+        billNo: this.filterQuery.billNo
+      }
+      checkDestinyProcess(query).then((response) => {
+        if (response.code == 20000) {
+          this.destinyProcessDelectShow = false;
+          this.destinyProcessCodeShow = false;
+          this.$nextTick(() => {
+            this.destinyProcessCodeShow = true;
+            this.destinyProcessDelectShow = true;
+          });
+        } else {
+          this.$message.error(response.message);
+        }
+      }).catch(() => {
+        this.$message.error(response.message);
+      });
+    }
+    ,
+    submitUpload() {
+      var query = {
+        billNo: this.filterQuery.billNo
+      }
+      addDestinyProcess(query).then((response) => {
+        if (response.code == 20000) {
+          this.closeDialogpr()
+        } else {
+          this.$message.error(response.message);
+        }
+      })
+          .catch(() => {
+            this.$message.error(response.message);
+          });
+    }
+    ,
+    generateUUID() {
+      // 获取时间戳
+      let date = (new Date()).valueOf();
+      // 生成的随机机器码
+      let txt = '1234567890';
+      // 机器码有多少位
+      let len = 13;
+      // 定义空变量用来接收机器码
+      let pwd = '';
+      for (let i = 0; i < len; i++) {
+        // 循环机器码位数随机填充
+        pwd += txt.charAt(Math.floor(Math.random() * txt.length));
+      }
+      // 相加生成唯一ID
+      return date + pwd;
+    }
+    ,
+    //获取当前仓库
+    findCurInvs() {
+      this.invList = [];
+      findInvByUser()
+          .then((response) => {
+            this.invList = response.data || [];
+          })
+          .catch(() => {
+          });
+    }
+    ,
+  },
+  components: {destinyModel, destinyProcessCode, destinyProcessDelect},
+  created() {
+    if (this.$isBlank(this.editQuery.billNo)) {
+      let date = new Date();
+      this.filterQuery.billNo =
+          parseTime(date, "{y}{m}{d}{h}{i}{s}") +
+          Math.ceil(Math.random() * 89 + 10);
+      this.filterQuery.billDate = parseTime(
+          date,
+          "{y}-{m}-{d} {h}:{i}:{s}"
+      );
+      this.filterQuery.destinyNo = this.generateUUID();
+    } else {
+      this.filterQuery = this.editQuery
+      this.destinyProcessDelectShow = true
+      this.destinyProcessCodeShow = true
+    }
+
+    this.getList();
+    this.findCurInvs();
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/basic/destiny/destiny.vue b/src/views/basic/destiny/destiny.vue
new file mode 100644
index 00000000..efa933bd
--- /dev/null
+++ b/src/views/basic/destiny/destiny.vue
@@ -0,0 +1,263 @@
+<template>
+  <div>
+    <el-card>
+      <el-form :model="filterQuery" label-width="100px" size="mini">
+        <el-row>
+          <el-col :span="4">
+            <el-form-item label="模板名称:" class="query-form-item">
+              <el-input v-model="filterQuery.name" placeholder="请输入模板名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="模板编码:" class="query-form-item">
+              <el-input v-model="filterQuery.code" placeholder="请输入模板编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-button-group>
+                <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
+                <el-button type="primary" icon="search" @click="handleAddClick">新增</el-button>
+              </el-button-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <el-table v-loading="loading" :data="list" @current-change="handleDetail" border highlight-current-row
+                style="width: 100%">
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="模板编码" prop="name" width="260"></el-table-column>
+        <el-table-column label="模板名称" prop="code" width="260"></el-table-column>
+        <el-table-column label="备注" prop="remark" width="260"></el-table-column>
+        <el-table-column label="创建人" prop="createByName" width="260"></el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="260"></el-table-column>
+        <el-table-column label="操作" width="220">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.native.stop="handleModifyClick(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
+            <el-button type="text" size="small" @click.native.stop="selectDialog(scope.row)">选入产品</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+          v-show="total>0"
+          :total="total"
+          :limit.sync="filterQuery.limit"
+          :page.sync="filterQuery.page"
+          @pagination="handleCurrentChange"
+      ></pagination>
+    </el-card>
+
+    <el-card>
+      <el-table v-loading="loading" :data="delectList" border highlight-current-row style="width: 100%">
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="产品DI" prop="nameCode" width="260"></el-table-column>
+        <el-table-column label="产品编码" prop="thirdId" width="260"></el-table-column>
+        <el-table-column label="产品名称" prop="cpmctymc" width="260"></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh"></el-table-column>
+        <el-table-column label="计量单位" prop="measname"></el-table-column>
+        <el-table-column label="数量" prop="count"></el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
+        <el-table-column label="注册/备案号" prop="certCode"></el-table-column>
+      </el-table>
+      <pagination
+          v-show="delectTotal>0"
+          :total="delectTotal"
+          :limit.sync="delectQuery.limit"
+          :page.sync="delectQuery.page"
+          @pagination="handleCurrentDelectChange"
+      ></pagination>
+    </el-card>
+
+    <el-dialog
+        :title="formMap[formName]"
+        :visible.sync="formVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="40%"
+        :before-close="closeDialog"
+        v-if="formVisible"
+    >
+      <destinyModelEdit
+          :editQuery="editQuery"
+          :closeDialog="closeDialog"
+      ></destinyModelEdit>
+    </el-dialog>
+
+    <el-dialog
+        title="选入产品"
+        :visible.sync="selectFormVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="80%"
+        :before-close="closeDialog"
+        v-if="selectFormVisible"
+    >
+      <destinyModelSelectProduct
+          :editQuery="editQuery"
+          :codeArray="codeArray"
+          :closeDialog="closeDialog"
+      ></destinyModelSelectProduct>
+    </el-dialog>
+
+
+  </div>
+</template>
+
+<script>
+import {
+  addModeldestiny,
+  delectModeldestiny,
+  filterDestinyDelect,
+  getBasicDestinyfilter
+} from "@/api/basic/basicDestinyRel";
+import destinyModelEdit from "@/views/basic/destiny/destinyModelEdit";
+import destinyModelSelectProduct from "@/views/basic/destiny/destinyModelSelectProduct";
+
+
+export default {
+  data() {
+    return {
+      filterQuery: {
+        name: "",
+        code: "",
+        type: 2,
+        page: 1,
+        limit: 20
+      },
+      editType: "",
+      formVisible: false,
+      selectFormVisible: false,
+      loading: false,
+      formName: "",
+      total: 0,
+      list: [],
+      codeArray: [],
+      editQuery: {},
+      formMap: {
+        "add": "新增定数包模板",
+        "edit": "编辑定数包模板"
+      },
+      delectQuery: {
+        id: null,
+        page: 1,
+        limit: 20
+      },
+      delectList: [],
+      delectTotal: 0,
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.filterQuery = {
+        name: "",
+        code: "",
+        type: 2,
+        page: 1,
+        limit: 20
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      getBasicDestinyfilter(this.filterQuery).then(response => {
+        this.loading = false;
+        this.list = response.data.list || [];
+        this.total = response.data.total || 0;
+      }).catch(() => {
+        this.loading = false;
+        this.list = [];
+        this.total = 0;
+        this.roles = [];
+      });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    handleCurrentDelectChange(val) {
+      this.delectQuery.page = val.page;
+      this.filterDestinyDelect()
+    },
+    handleAddClick() {
+      this.formName = "add";
+      this.formVisible = true;
+    },
+    handleModifyClick(row) {
+      this.formName = "edit";
+      this.formVisible = true;
+      this.editQuery = row;
+    },
+    deleteDialog(row) {
+      delectModeldestiny(row).then(res => {
+        if (res.code == 20000) {
+          this.getList();
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch(() => {
+        this.$message.error("删除失败！");
+      });
+    },
+    selectDialog(row) {
+      this.selectFormVisible = true;
+      this.editQuery = row;
+    },
+    closeDialog() {
+      this.formVisible = false;
+      this.selectFormVisible = false;
+      this.getList();
+      this.delectList=[]
+      this.editQuery = {}
+    },
+    handleDetail(row) {
+      this.delectQuery.id = row.id
+      this.filterDestinyDelect()
+    },
+    filterDestinyDelect() {
+      filterDestinyDelect(this.delectQuery)
+          .then((response) => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.delectList = response.data.list || [];
+              this.delectTotal = response.data.total || 0;
+            } else {
+              this.$message.error(response.message);
+              this.delectList = [];
+              this.delectTotal = 0;
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+            this.delectList = [];
+            this.delectTotal = 0;
+          });
+    },
+  }
+  ,
+  mounted() {
+  }
+  ,
+  components: {
+    destinyModelEdit, destinyModelSelectProduct
+  }
+  ,
+  created() {
+    this.getList();
+  }
+}
+;
+</script>
diff --git a/src/views/basic/destiny/destinyModel.vue b/src/views/basic/destiny/destinyModel.vue
new file mode 100644
index 00000000..e928fee9
--- /dev/null
+++ b/src/views/basic/destiny/destinyModel.vue
@@ -0,0 +1,145 @@
+<template>
+  <div>
+    <el-card>
+      <el-form :model="filterQuery" label-width="100px" size="mini">
+        <el-row>
+          <el-col :span="4">
+            <el-form-item label="模板名称:" class="query-form-item">
+              <el-input v-model="filterQuery.name" placeholder="请输入模板名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="模板编码:" class="query-form-item">
+              <el-input v-model="filterQuery.code" placeholder="请输入模板编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-button-group>
+                <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
+                <el-button type="primary" icon="search" @click="combine">选入</el-button>
+              </el-button-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <el-table :data="list"  border highlight-current-row   style="width: 100%" >
+        <el-table-column width="50">
+          <template slot-scope="scope">
+            <el-radio v-model="radio" :label="scope.row.id"  @change.native.stop="showRow(scope.row.id)"><span></span></el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="模板编码" prop="name" ></el-table-column>
+        <el-table-column label="模板名称" prop="code" ></el-table-column>
+        <el-table-column label="备注" prop="remark" ></el-table-column>
+        <el-table-column label="创建人" prop="createByName" ></el-table-column>
+        <el-table-column label="创建时间" prop="createTime" ></el-table-column>
+      </el-table>
+
+      <pagination
+          v-show="total>0"
+          :total="total"
+          :limit.sync="filterQuery.limit"
+          :page.sync="filterQuery.page"
+          @pagination="handleCurrentChange"
+      ></pagination>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {
+  addModeldestiny,
+  delectModeldestiny,
+  filterDestinyDelect,
+  getBasicDestinyfilter
+} from "@/api/basic/basicDestinyRel";
+import destinyModelEdit from "@/views/basic/destiny/destinyModelEdit";
+import destinyModelSelectProduct from "@/views/basic/destiny/destinyModelSelectProduct";
+import {isBlank} from "@/utils/strUtil";
+
+
+export default {
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      filterQuery: {
+        name: "",
+        code: "",
+        type: 2,
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      destinyId:null,
+      radio:null,
+      list: [],
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.filterQuery = {
+        name: "",
+        code: "",
+        type: 2,
+        page: 1,
+        limit: 20
+      };
+      this.getList();
+      this.destinyId=null
+    },
+    onSubmit() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      getBasicDestinyfilter(this.filterQuery).then(response => {
+        this.loading = false;
+        this.list = response.data.list || [];
+        this.total = response.data.total || 0;
+      }).catch(() => {
+        this.loading = false;
+        this.list = [];
+        this.total = 0;
+        this.roles = [];
+      });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    showRow (row) {
+      this.destinyId= row
+    },
+    combine(){
+      if(isBlank(this.destinyId)){
+        return this.$message.error("请先选择定数包！");
+      }
+      this.closeDialog(this.destinyId);
+    }
+  }
+  ,
+  mounted() {
+  }
+  ,
+  created() {
+    this.getList();
+  }
+}
+;
+</script>
diff --git a/src/views/basic/destiny/destinyModelEdit.vue b/src/views/basic/destiny/destinyModelEdit.vue
new file mode 100644
index 00000000..4fcbdfda
--- /dev/null
+++ b/src/views/basic/destiny/destinyModelEdit.vue
@@ -0,0 +1,113 @@
+<template>
+  <div>
+    <el-form :model="editLogin" label-width="30%">
+      <el-card>
+        <el-row>
+          <el-col :span="18">
+            <div class="text item">
+              <el-form-item label="模板名称" prop="unitId">
+                <el-input v-model="editLogin.name" placeholder="请输入模板名称" style="width: 100%"
+                          size="small"></el-input>
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="18">
+            <div class="text item">
+              <el-form-item label="模板编号" prop="unitId">
+                <el-input v-model="editLogin.code" placeholder="请输入模板编号" style="width: 100%"
+                          size="small"></el-input>
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>
+
+
+        <el-row>
+          <el-col :span="18">
+            <div class="text item">
+              <el-form-item label="备注" prop="unitId">
+                <el-input type="textarea" :rows="3" v-model="editLogin.remark" placeholder="请输入备注"></el-input>
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>
+        <div style="text-align: center; margin-top: 10px;">
+          <el-button type="primary" size="small" icon="search" @click="onModifySubmit">提交</el-button>
+          <el-button type="primary" size="small" icon="search" @click="closeDialog">取消</el-button>
+        </div>
+      </el-card>
+    </el-form>
+  </div>
+</template>
+
+<script>
+
+
+import {addModeldestiny,editModeldestiny} from "@/api/basic/basicDestinyRel";
+import {isBlank} from "@/utils/strUtil";
+
+export default {
+  name: 'bindPlatformModel',
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    editQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      editLogin: {
+        id: null,
+        name: null,
+        code: null,
+        remark: null,
+      },
+    };
+  },
+  methods: {
+    onModifySubmit() {
+      if (this.editLogin.id != null) {
+        editModeldestiny(this.editLogin).then(res => {
+          if (res.code == 20000) {
+            this.closeDialog();
+          } else {
+            this.$message.error(res.message);
+          }
+        }).catch(() => {
+          this.$message.error("编辑失败！");
+        });
+      } else {
+        addModeldestiny(this.editLogin).then(res => {
+          if (res.code == 20000) {
+            this.closeDialog();
+          } else {
+            this.$message.error(res.message);
+          }
+        }).catch(() => {
+          this.$message.error("提交失败！");
+        });
+      }
+    }
+
+
+  },
+  created() {
+    if(isBlank(this.editQuery.id)){
+      this.editLogin = {}
+    }else {
+      this.editLogin = this.editQuery
+    }
+  }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/basic/destiny/destinyModelSelectProduct.vue b/src/views/basic/destiny/destinyModelSelectProduct.vue
new file mode 100644
index 00000000..1ff5a657
--- /dev/null
+++ b/src/views/basic/destiny/destinyModelSelectProduct.vue
@@ -0,0 +1,222 @@
+<template>
+  <div>
+    <el-form :model="editLogin" label-width="120px">
+      <el-card>
+        <el-row>
+          <el-col :span="6">
+            <div class="text item">
+              <el-form-item label="产品名称" prop="unitId">
+                <el-input v-model="editLogin.cpmctymc" placeholder="请输入产品名称" style="width: 100%"
+                          size="small"></el-input>
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col :span="11" style="margin-left: 20px">
+            <el-button type="primary" size="small" icon="search" @click="onModifySelect">查询</el-button>
+          </el-col>
+        </el-row>
+        <el-divider style="margin: 15px"></el-divider>
+        <el-row>
+          <el-col :span="24">
+            <el-button type="primary" style="float: right;margin-bottom: 12px;margin-right: 20px" size="small"
+                       icon="search" @click="selectProduct">选入产品
+            </el-button>
+          </el-col>
+        </el-row>
+
+
+        <el-table v-loading="loading" :data="list" border highlight-current-row style="width: 100%">
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column label="产品DI" prop="nameCode" width="260"></el-table-column>
+          <el-table-column label="产品编码" prop="thirdId" width="260"></el-table-column>
+          <el-table-column label="产品名称" prop="cpmctymc" width="260"></el-table-column>
+          <el-table-column label="规格型号" prop="ggxh"></el-table-column>
+          <el-table-column label="计量单位" prop="measname"></el-table-column>
+          <el-table-column label="数量" prop="count">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.count"
+                        placeholder="请输入数量" style="width: 80%"
+                        type='number'
+                        :disabled="scope.row.index !== selectedIndex"
+                        oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
+          <el-table-column label="注册/备案号" prop="certCode"></el-table-column>
+          <el-table-column label="操作" width="220">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex"
+                         @click.native.stop="rowChange(scope.row)">编辑
+              </el-button>
+              <el-button type="text" size="small" :disabled="scope.row.index !== selectedIndex" @click.stop="true"
+                         @click.native="tableCountChange(scope.row)">保存
+              </el-button>
+              <el-button type="text" size="small" @click.native.stop="delectModifyClick(scope.row)">移除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+    </el-form>
+    <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="editLogin.page"
+        :limit.sync="editLogin.limit"
+        @pagination="handleErpPageChange"
+
+    ></pagination>
+
+    <el-dialog
+        title="选入产品详情"
+        :visible.sync="selectFormVisible"
+        append-to-body
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="80%"
+        :before-close="closeDialog"
+        v-if="selectFormVisible"
+    >
+      <destinySelectProduct
+          :editQuery="editLogin"
+          :closeDialog="closeProudDialog"
+      ></destinySelectProduct>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+
+import {
+  addModeldestiny,
+  editModeldestiny,
+  filterDestinyDelect,
+  delectModeldestinyProduct, uploadModeldestinyProduct
+} from "@/api/basic/basicDestinyRel";
+import {isBlank} from "@/utils/strUtil";
+import destinySelectProduct from "@/views/basic/destiny/destinySelectProduct";
+import {deleteCompanyCert} from "@/api/purchase/companyCert";
+import {updateDetail} from "@/api/purchase/purApply";
+
+export default {
+  name: 'destinyModelSelectProduct',
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    editQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      editLogin: {
+        id: null,
+        cpmctymc: null,
+        ids: [],
+        page: 1,
+        limit: 10,
+      },
+      total: 0,
+      selectedIndex: '',
+      loading: false,
+      list: [],
+      selectFormVisible: false
+    };
+  },
+  methods: {
+    selectProduct() {
+      this.selectFormVisible = true;
+    },
+    closeProudDialog() {
+      this.selectFormVisible = false;
+      this.filterDestinyDelect();
+    },
+    filterDestinyDelect() {
+      filterDestinyDelect(this.editLogin)
+          .then((response) => {
+            this.loading = false;
+            if (response.code === 20000) {
+              console.log(response)
+              this.list = response.data.list || [];
+              this.total = response.data.total || 0;
+            } else {
+              this.$message.error(response.message);
+              this.list = [];
+              this.total = 0;
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
+    onModifySelect() {
+      this.filterDestinyDelect();
+    },
+    handleErpPageChange(val) {
+      this.editLogin.page = val.page;
+      this.filterDestinyDelect();
+    },
+    delectModifyClick(row) {
+      this.$confirm("是否删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.loading = true;
+        let tquery = {
+          id: row.deId
+        };
+        delectModeldestinyProduct(tquery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code === 20000) {
+                this.filterDestinyDelect();
+                this.$message({
+                  type: "success",
+                  message: "删除成功！",
+                });
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.certLoading = false;
+            });
+      }).catch(() => {
+      });
+    },
+    rowChange(val) {
+      this.selectedIndex = val.index
+    },
+    tableCountChange(row) {
+      if (this.$isNotBlank(row)) {
+        var query = {
+          id: row.deId,
+          count: row.count
+        }
+        uploadModeldestinyProduct(query);
+        this.selectedIndex = null
+      }
+    },
+  },
+  components: {
+    destinySelectProduct
+  },
+  created() {
+    if (!isBlank(this.editQuery.id)) {
+      this.editLogin.id = this.editQuery.id
+      this.filterDestinyDelect();
+    }
+  }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/basic/destiny/destinyProcess.vue b/src/views/basic/destiny/destinyProcess.vue
new file mode 100644
index 00000000..97e4ffed
--- /dev/null
+++ b/src/views/basic/destiny/destinyProcess.vue
@@ -0,0 +1,265 @@
+<template>
+  <div>
+    <el-card>
+      <el-form :model="filterQuery" label-width="100px" size="mini">
+        <el-row>
+          <el-col :span="4">
+            <el-form-item label="单据号:" class="query-form-item">
+              <el-input v-model="filterQuery.name" placeholder="请输入模板名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="单前仓库:" class="query-form-item">
+              <el-input v-model="filterQuery.code" placeholder="请输入模板编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="单据时间:" class="query-form-item">
+              <el-input v-model="filterQuery.code" placeholder="请输入模板编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-button-group>
+                <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
+                <el-button type="primary" icon="search" @click="handleAddClick">新增</el-button>
+              </el-button-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <el-table v-loading="loading" :data="list" @current-change="handleDetail" border highlight-current-row
+                style="width: 100%">
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" width="260"></el-table-column>
+        <el-table-column label="唯一编码" prop="destinyNo" width="260"></el-table-column>
+        <el-table-column label="当前仓库" prop="invName" width="260"></el-table-column>
+        <el-table-column label="单据时间" prop="billDate" width="260"></el-table-column>
+        <el-table-column label="状态" prop="status" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-tag :type="statusFilterType(scope.row.status)">{{ statusMap[scope.row.status] }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" prop="createName" width="260"></el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="260"></el-table-column>
+        <el-table-column label="操作" width="220">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" :disabled="scope.row.status==2" @click.native.stop="handleModifyClick(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+          v-show="total>0"
+          :total="total"
+          :limit.sync="filterQuery.limit"
+          :page.sync="filterQuery.page"
+          @pagination="handleCurrentChange"
+      ></pagination>
+    </el-card>
+
+<!--    <el-card>-->
+<!--      <el-table v-loading="loading" :data="delectList" border highlight-current-row style="width: 100%">-->
+<!--        <el-table-column label="序号" type="index"></el-table-column>-->
+<!--        <el-table-column label="产品DI" prop="nameCode" width="260"></el-table-column>-->
+<!--        <el-table-column label="产品编码" prop="thirdId" width="260"></el-table-column>-->
+<!--        <el-table-column label="产品名称" prop="cpmctymc" width="260"></el-table-column>-->
+<!--        <el-table-column label="规格型号" prop="ggxh"></el-table-column>-->
+<!--        <el-table-column label="计量单位" prop="measname"></el-table-column>-->
+<!--        <el-table-column label="数量" prop="count"></el-table-column>-->
+<!--        <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>-->
+<!--        <el-table-column label="注册/备案号" prop="certCode"></el-table-column>-->
+<!--      </el-table>-->
+<!--      <pagination-->
+<!--          v-show="delectTotal>0"-->
+<!--          :total="delectTotal"-->
+<!--          :limit.sync="delectQuery.limit"-->
+<!--          :page.sync="delectQuery.page"-->
+<!--          @pagination="handleCurrentDelectChange"-->
+<!--      ></pagination>-->
+<!--    </el-card>-->
+
+    <el-dialog
+        :title="formMap[formName]"
+        :visible.sync="formVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="80%"
+        :before-close="closeDialog"
+        v-if="formVisible"
+    >
+      <addDestinyProcess
+          :editQuery="editQuery"
+          :closeDialogpr="closeDialog"
+      ></addDestinyProcess>
+    </el-dialog>
+
+
+
+  </div>
+</template>
+
+<script>
+import {
+  delectModeldestiny,
+  filterDestinyDelect,
+  getBasicDestinyfilter
+} from "@/api/basic/basicDestinyRel";
+import addDestinyProcess from "@/views/basic/destiny/addDestinyProcess";
+import {delectDestinyProcess, filterDestinyProcess} from "@/api/inout/ioDestinyProcess";
+
+
+export default {
+  data() {
+    return {
+      filterQuery: {
+        name: "",
+        code: "",
+        type: 2,
+        page: 1,
+        limit: 20
+      },
+      editType: "",
+      formVisible: false,
+      loading: false,
+      formName: "",
+      total: 0,
+      list: [],
+      codeArray: [],
+      editQuery: {},
+      formMap: {
+        "add": "新增定数包模板",
+        "edit": "编辑定数包模板"
+      },
+      statusMap: {
+        0: "草稿",
+        1: "未提交",
+        2: "已提交",
+      },
+      delectQuery: {
+        id: null,
+        page: 1,
+        limit: 20
+      },
+      delectList: [],
+      delectTotal: 0,
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.filterQuery = {
+        name: "",
+        code: "",
+        type: 2,
+        page: 1,
+        limit: 20
+      };
+      this.getList();
+    },
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "warning",
+        2: "danger",
+        3: "success",
+      };
+      return statusMap[status];
+    },
+    onSubmit() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      filterDestinyProcess(this.filterQuery).then(response => {
+        this.loading = false;
+        this.list = response.data.list || [];
+        this.total = response.data.total || 0;
+      }).catch(() => {
+        this.loading = false;
+        this.list = [];
+        this.total = 0;
+        this.roles = [];
+      });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    handleCurrentDelectChange(val) {
+      this.delectQuery.page = val.page;
+      this.filterDestinyDelect()
+    },
+    handleAddClick() {
+      this.formName = "add";
+      this.formVisible = true;
+    },
+    handleModifyClick(row) {
+      this.formName = "edit";
+      this.formVisible = true;
+      this.editQuery = row;
+    },
+    deleteDialog(row) {
+      delectDestinyProcess(row).then(res => {
+        if (res.code == 20000) {
+          this.getList();
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch(() => {
+        this.$message.error("删除失败！");
+      });
+    },
+    closeDialog() {
+      this.formVisible = false;
+      this.getList();
+      this.delectList=[]
+      this.editQuery = {}
+    },
+    handleDetail(row) {
+      this.delectQuery.id = row.id
+      this.filterDestinyDelect()
+    },
+    filterDestinyDelect() {
+      filterDestinyDelect(this.delectQuery)
+          .then((response) => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.delectList = response.data.list || [];
+              this.delectTotal = response.data.total || 0;
+            } else {
+              this.$message.error(response.message);
+              this.delectList = [];
+              this.delectTotal = 0;
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+            this.delectList = [];
+            this.delectTotal = 0;
+          });
+    },
+  }
+  ,
+  mounted() {
+  }
+  ,
+  components: {
+    addDestinyProcess
+  }
+  ,
+  created() {
+    this.getList();
+  }
+}
+;
+</script>
diff --git a/src/views/basic/destiny/destinyProcessCode.vue b/src/views/basic/destiny/destinyProcessCode.vue
new file mode 100644
index 00000000..fea1f977
--- /dev/null
+++ b/src/views/basic/destiny/destinyProcessCode.vue
@@ -0,0 +1,101 @@
+<template>
+  <div>
+    <el-table v-loading="loading" :data="list" border highlight-current-row style="width: 100%">
+      <el-table-column label="序号" type="index"></el-table-column>
+      <el-table-column label="UDI码" prop="code" width="260"></el-table-column>
+      <el-table-column label="产品DI" prop="nameCode" width="260"></el-table-column>
+      <el-table-column label="产品名称" prop="cpmctymc" width="260"></el-table-column>
+      <el-table-column label="规格型号" prop="ggxh"></el-table-column>
+      <el-table-column label="批次号" prop="batchNo"></el-table-column>
+      <el-table-column label="生产日期" prop="productDate" width="100"></el-table-column>
+      <el-table-column label="失效日期" prop="expireDate" width="100"></el-table-column>
+      <el-table-column label="序列号" prop="serialNo"></el-table-column>
+      <el-table-column label="扫码数量" prop="count"></el-table-column>
+      <el-table-column label="实际数量" prop="reCount"></el-table-column>
+    </el-table>
+
+  </div>
+</template>
+
+<script>
+import {filterDestinyDelect, filterDestinyProduct, getBasicDestinyfilter} from "@/api/basic/basicDestinyRel";
+import addDestinyProcess from "@/views/basic/destiny/addDestinyProcess";
+import {filterDestinyProcessCode} from "@/api/inout/ioDestinyProcess";
+
+
+export default {
+  name: "destinyProcessCode",
+  props: {
+    billNo: {
+      type: Object,
+      required: true
+    },
+    destinyProcessCodeShow: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      filterQuery: {
+        name: "",
+        code: "",
+        type: 2,
+        page: 1,
+        limit: 20
+      },
+      loading: false,
+      list: [],
+      total: 0
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.filterQuery = {
+        page: 1,
+        limit: 20
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      this.filterQuery.billNo = this.billNo
+      filterDestinyProcessCode(this.filterQuery).then(response => {
+        this.loading = false;
+        this.list = response.data.list || [];
+        this.total = response.data.total || 0;
+      }).catch(() => {
+        this.loading = false;
+        this.list = [];
+        this.total = 0;
+        this.roles = [];
+      });
+    },
+  }
+  ,
+  mounted() {
+  }
+  ,
+  components: {
+    addDestinyProcess
+  }
+  ,
+
+  created() {
+    if(this.destinyProcessCodeShow==true){
+      this.getList();
+    }
+  }
+}
+;
+</script>
diff --git a/src/views/basic/destiny/destinyProcessDelect.vue b/src/views/basic/destiny/destinyProcessDelect.vue
new file mode 100644
index 00000000..9c9dc9dc
--- /dev/null
+++ b/src/views/basic/destiny/destinyProcessDelect.vue
@@ -0,0 +1,97 @@
+<template>
+  <div>
+    <el-table v-loading="loading" :data="list" border highlight-current-row style="width: 100%">
+      <el-table-column label="序号" type="index"></el-table-column>
+      <el-table-column label="产品DI" prop="nameCode" width="260"></el-table-column>
+      <el-table-column label="产品编码" prop="thirdId" width="260"></el-table-column>
+      <el-table-column label="产品名称" prop="cpmctymc" width="260"></el-table-column>
+      <el-table-column label="规格型号" prop="ggxh"></el-table-column>
+      <el-table-column label="计量单位" prop="measname"></el-table-column>
+      <el-table-column label="单据数量" prop="count"></el-table-column>
+      <el-table-column label="扫码数量" prop="reCount"></el-table-column>
+      <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
+      <el-table-column label="注册/备案号" prop="certCode"></el-table-column>
+    </el-table>
+
+  </div>
+</template>
+
+<script>
+
+import addDestinyProcess from "@/views/basic/destiny/addDestinyProcess";
+import {filterDestinyDelect} from "@/api/inout/ioDestinyProcess";
+
+
+export default {
+  name: "destinyProcessDelect",
+  props: {
+    billNo: {
+      type: Object,
+      required: true
+    },
+    destinyProcessCodeShow: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      filterQuery: {
+        name: "",
+        code: "",
+        type: 2,
+        page: 1,
+        limit: 20
+      },
+      loading: false,
+      list: [],
+      total: 0
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.filterQuery = {
+        page: 1,
+        limit: 20
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      this.filterQuery.billNo = this.billNo
+      filterDestinyDelect(this.filterQuery).then(response => {
+        this.loading = false;
+        this.list = response.data || [];
+      }).catch(() => {
+        this.loading = false;
+        this.list = [];
+      });
+    },
+  }
+  ,
+  mounted() {
+  }
+  ,
+
+  components: {
+    addDestinyProcess
+  }
+  ,
+  created() {
+    if(this.destinyProcessCodeShow==true){
+      this.getList();
+    }
+  }
+}
+;
+</script>
diff --git a/src/views/basic/destiny/destinySelectProduct.vue b/src/views/basic/destiny/destinySelectProduct.vue
new file mode 100644
index 00000000..e4ed795c
--- /dev/null
+++ b/src/views/basic/destiny/destinySelectProduct.vue
@@ -0,0 +1,339 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="listQuery" label-width="120px" v-show="showSearch">
+        <el-row>
+          <el-col :span="18">
+            <el-form-item label="UDI码:" class="query-form-item">
+              <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="拼音简写:" class="query-form-item">
+              <el-input v-model="listQuery.pinyinInitial" @input="search" style="width: 100%" placeholder="请输入物资拼音简写"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="第三方物资编码:" class="query-form-item">
+              <el-input v-model="listQuery.thrPiId" style="width: 100%" placeholder="第三方物资编码"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="分类编码:" class="query-form-item">
+              <el-input v-model="listQuery.flbm" style="width: 100%" placeholder="请输入分类编码"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="供应商:" class="query-form-item">
+              <el-input v-model="listQuery.companyName" style="width: 100%" placeholder="请输入供应商"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="物品编码:" class="query-form-item">
+              <el-input v-model="listQuery.unionCode" style="width: 100%" placeholder="请输入DI/医保编码/商品条码"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="产品通用名:" class="query-form-item">
+              <el-input v-model="listQuery.cpmctymc" style="width: 100%" placeholder="请输入产品通用名"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格型号:" class="query-form-item">
+              <el-input v-model="listQuery.ggxh" style="width: 100%" placeholder="请输入规格型号" clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产企业:" class="query-form-item">
+              <el-input v-model="listQuery.manufactory" style="width: 100%" placeholder="请输入生产企业/注册备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="物资分类:" class="query-form-item">
+              <el-input v-model="listQuery.category" style="width: 100%" placeholder="请输入物资分类名称"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+
+      <div class="top-right-btn">
+        <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="search">查询</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="confirmSelect">确定</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+
+      <el-table :data="dataList" style="width: 100%" v-loading="loading" border highlight-current-row
+                 @selection-change="handleSelectionChange" ref="multipleTable">
+        <el-table-column type="selection" :reserve-selection="true"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
+        <el-table-column label="第三方物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
+        <el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="pageTotal>0"
+        :total="pageTotal"
+        :page.sync="listQuery.page"
+        :limit.sync="listQuery.limit"
+        @pagination="handleErpPageChange"
+
+      ></pagination>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {filterCompanyProductplanRelevance, filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevance";
+import {addApplyDetail, addApply} from "../../../api/purchase/purApply";
+import store from "../../../store";
+import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
+import {finProductSet} from "@/api/param/systemParamConfig";
+import {addModeldestinyProduct, filterDestinyDelect, filterDestinyProduct} from "@/api/basic/basicDestinyRel";
+
+export default {
+  name: "stockOrderNewSelectProduct",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    editQuery: {
+      type: Object,
+      required: true,
+    },
+    codeArray: {
+      type: Object,
+      required: true,
+    },
+  },
+
+  data() {
+    return {
+      showSearch: true,
+      listQuery: {
+        purType: null,
+        udiCode: null,
+        unicode: null,
+        cpmctymc: null,
+        ggxh: null,
+        ylqxzcrbarmc: null,
+        thrPiId: null,
+        pinyinInitial: null,
+        page: 1,
+        limit: 10,
+      },
+      combineQuery: {
+        thirdId: "",
+        relId: "",
+        erpName: "",
+        keys: [],
+      },
+      ids: [],
+      lists: [],
+      radioCheck: null,
+      dataList: [],
+      pageTotal: 1,
+      total: 1,
+      currentRow: null,
+      loading: false,
+      udiRlDetailVisible: false,
+      thirdSys: [],
+      thirdSysFk: null,
+      busTypes: [],
+      actDateRange: [],
+      tQuery: {
+        productId: "",
+        productName: "",
+        count: "",
+        orderIdFk: "",
+        supId: "",
+      },
+      productRemarkSet: {},
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      orderEditor: false,
+      orderId: "",
+      currentCert: null,
+      certList: [],
+      dialogFormVisible: false,
+      multipleSelection: null,
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.listQuery = {
+        purType: null,
+        udiCode: null,
+        unicode: null,
+        cpmctymc: null,
+        ggxh: null,
+        ylqxzcrbarmc: null,
+        thrPiId: null,
+        page: 1,
+        limit: 10
+      }
+      this.multipleSelection = [];
+      this.radioCheck = null;
+      this.currentRow = null;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleCurrentChange(val) {
+      this.unionQuery.page = val;
+      this.getList();
+    },
+    handleChange(val) {
+      this.radioCheck = val.id;
+      this.currentRow = val;
+      this.multipleSelection = val
+    },
+    handleDetailClick(row) {
+      this.currentRow = row;
+      this.udiRlDetailVisible = true;
+
+    },
+    handleErpPageChange(val) {
+      this.listQuery.page = val.page;
+      this.getList();
+    },
+    keyup_submit(event) {
+      this.listQuery.page = 1;
+      this.getList();
+      event.target.select();
+    },
+    search() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    handleSelectionChange(val) {
+      this.lists = [];
+      for (var i = 0; i < val.length; i++) {
+        this.lists.push(val[i].id)
+      }
+    },
+    getList() {
+      this.loading = true;
+      this.listQuery.id = this.editQuery.id
+      filterDestinyProduct(this.listQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.dataList = response.data.list || [];
+            this.pageTotal = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+            this.dataList = [];
+            this.pageTotal = 0;
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+    confirmSelect() {
+      if (this.lists == null) {
+        this.$message.error('未选择产品');
+        return;
+      }
+      this.combine();
+    },
+    combine() {
+      this.loading = true;
+      addModeldestinyProduct({pId:this.editQuery.id,list:this.lists}).then((response) => {
+        this.loading = false;
+        if (response.code === 20000) {
+          this.closeDialog(response.data);
+        } else {
+            this.$message.error(response.message);
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
+    },
+  },
+  components: {udiRlDetailDialog},
+
+  created() {
+  },
+};
+</script>
+
+<style scoped>
+
+.query-form-item {
+  display: block !important;
+  margin-right: 1px;
+  margin-bottom: 5px;
+}
+
+div /deep/ .el-table .warning-row {
+  background: #bebebe;
+}
+
+div /deep/ .el-table .success-row {
+  background: #ffffff;
+}
+</style>
diff --git a/src/views/basic/product/bindProduct.vue b/src/views/basic/product/bindProduct.vue
index 4f3ea9a4..3f358434 100644
--- a/src/views/basic/product/bindProduct.vue
+++ b/src/views/basic/product/bindProduct.vue
@@ -259,7 +259,6 @@ export default {
       var ids = this.productList.map((item) => item.id)
       var data = {code: this.rId, ids: ids}
       saveRel(data).then((response) => {
-        debugger
         if (response.code == 20000) {
           this.$message.success("选入成功!");
           this.closeDialog();
diff --git a/src/views/basic/product/productCategory.vue b/src/views/basic/product/productCategory.vue
index 653833b3..24b9bcc0 100644
--- a/src/views/basic/product/productCategory.vue
+++ b/src/views/basic/product/productCategory.vue
@@ -1550,7 +1550,6 @@ export default {
 
 
     remove(node, data) {
-      debugger
       if (data.id) {
         this.$confirm("确认删除该节点吗?", "提示", {
           type: "warning",
diff --git a/src/views/userManage/bindPlatformEditModel.vue b/src/views/userManage/bindPlatformEditModel.vue
index 7a39ef33..3840e874 100644
--- a/src/views/userManage/bindPlatformEditModel.vue
+++ b/src/views/userManage/bindPlatformEditModel.vue
@@ -268,7 +268,6 @@ export default {
     }
   },
   created() {
-    debugger
     if(this.formQuery==1){
       this.editLogin.platformId = this.editQuery.platformId;
       this.editLogin.appid = this.editQuery.appid;

From e8a74e7347de6322165e3be6c0b81a5ca50d7d7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 6 Jul 2023 09:19:54 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/busType/bussinessTypeModify.vue     |  14 +-
 src/views/basic/business/stockOrder.vue       |   3 +-
 src/views/inout/DialogCreateOrder.vue         |   7 +
 .../inout/muti/ioOrderMutiEditDialog.vue      |  13 +-
 src/views/inventory/inner/innerOrder.vue      | 172 +++++++++---------
 5 files changed, 113 insertions(+), 96 deletions(-)

diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 24280f0f..79d7bedf 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -598,7 +598,7 @@
                 <el-select v-model="inputQuery.checkPdaEd" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
@@ -621,7 +621,7 @@
                 <el-select v-model="inputQuery.checkUdims" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
@@ -644,7 +644,7 @@
                 <el-select v-model="inputQuery.checkPc" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
@@ -667,7 +667,7 @@
                 <el-select v-model="inputQuery.checkSp" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
@@ -689,7 +689,7 @@
                 <el-select v-model="inputQuery.checkChange" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
@@ -712,7 +712,7 @@
                 <el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 75%"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
@@ -734,7 +734,7 @@
                 <el-select v-model="inputQuery.checkCopy" style="width: 75%" :disabled="!inputQuery.checkEnable"
                            placeholder="是否启用"
                 >
-                  <el-option label="无业业务单扫码拣货" :value="0"></el-option>
+                  <el-option label="无业务单扫码拣货" :value="0"></el-option>
                   <el-option label="有业务单有三期拣货" :value="1"></el-option>
                   <el-option label="有业务单无三期拣货" :value="2"></el-option>
                   <el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 394f8f51..2c8aed38 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -341,10 +341,9 @@ export default {
         endTime: "",
         inCodeStatus: 0,
       };
-      this.getList();
-
       this.haveDistributionVisible = true;
       this.actDateRange = [];
+      this.getList();
     },
     hideSearch() {
       this.showSearch = !this.showSearch;
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index e4c53f00..f7e1733e 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -124,6 +124,7 @@
               v-if="
                 curAction.corpType === 0 ||
                 curAction.corpType === 2 ||
+                curAction.corpType === 4 ||
                 (curAction.corpType === 1 && !curAction.genUnit)
               "
             >
@@ -790,6 +791,7 @@ export default {
         page: 1,
         limit: 20,
       };
+      debugger
       if (this.curAction.corpType == 3) {
         //内部科室
         cQuery.corpType = 3;
@@ -801,6 +803,9 @@ export default {
       } else if (this.curAction.corpType == 1) {
         cQuery.corpType = 1;
         cQuery.outType = 2;
+      }else if (this.curAction.corpType == 4) {
+        //供应商信息
+        cQuery.corpType = 4;
       } else
         return;
       getBasicUnitMaintains(cQuery)
@@ -815,6 +820,7 @@ export default {
 
     //单据类型改变
     actionChange(item) {
+
       this.orderFormData.checkPreInOption = null;
       this.orderFormData.checkPreInOrders = null;
       this.checkPreInArray = [];
@@ -829,6 +835,7 @@ export default {
       if (
         this.curAction.corpType == 0 ||
         this.curAction.corpType == 2 ||
+        this.curAction.corpType == 4 ||
         (this.curAction.corpType == 1 && !this.curAction.genUnit)
       ) {
         //1.切换往来单位
diff --git a/src/views/inout/muti/ioOrderMutiEditDialog.vue b/src/views/inout/muti/ioOrderMutiEditDialog.vue
index f20636b3..95732523 100644
--- a/src/views/inout/muti/ioOrderMutiEditDialog.vue
+++ b/src/views/inout/muti/ioOrderMutiEditDialog.vue
@@ -61,12 +61,12 @@
           <el-col :span="17">
             <el-form-item label="往来单位:">
               <el-input v-model="inputQuery.fromCorp" ref="fromCorpInputRef"
-                        @keypress.enter.native="addFromCorp($event)" :disabled="this.inputQuery.udiCode==null"
+                        @keypress.enter.native="addFromCorp($event)" :disabled="this.inputQuery.udiCode==null || this.showFlg ==false"
                         placeholder="请输入往来单位" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="2">
-            <el-button type="primary" size="mini" :disabled="this.inputQuery.udiCode==null" @click="addFromCorp"
+            <el-button type="primary" size="mini" :disabled="this.inputQuery.udiCode==null  || this.showFlg == false" @click="addFromCorp"
                        style="margin-left: 15px">添加
             </el-button>
           </el-col>
@@ -153,6 +153,7 @@ export default {
         supId: null,
       },
       pId: null,
+      showFlg:false,
       popupsVisible: false,
       orderMutiDelectVisible: false,
       tableName: '使用记录选择',
@@ -255,6 +256,8 @@ export default {
                         this.inputQuery.totalCount = response.data.data.totalCount
                         this.inputQuery.useCount = response.data.data.useCount
                         this.$refs.fromCorpInputRef.focus();
+                        this.checkType=null;
+                        this.showFlg=false;
                         this.enterKeyup();
                       } else {
                         this.$refs.markInputRef.focus();
@@ -270,6 +273,8 @@ export default {
                 });
               } else if (data == 'no') {
                 this.inputQuery.mark = "";
+                this.checkType=1;
+                this.showFlg=false;
                 this.$refs.markInputRef.focus();
                 this.enterKeyup();
               }
@@ -321,6 +326,9 @@ export default {
 
       if (this.inputQuery.fromCorp != 'true' && this.inputQuery.fromCorp != 'false') {
         var query = {
+          udiCode:this.inputQuery.udiCode,
+          mark:this.inputQuery.mark,
+          checkType:this.checkType,
           mutiIdFk: this.pId,
           fromCorp: this.inputQuery.fromCorp
         }
@@ -418,6 +426,7 @@ export default {
           this.inputQuery.totalCount = response.data.totalCount
           this.inputQuery.useCount = response.data.useCount
           this.pId = response.data.id;
+          this.showFlg=true;
           this.$refs.fromCorpInputRef.focus();
           this.selectMutiDetailList()
         } else {
diff --git a/src/views/inventory/inner/innerOrder.vue b/src/views/inventory/inner/innerOrder.vue
index 93356a98..d6c01351 100644
--- a/src/views/inventory/inner/innerOrder.vue
+++ b/src/views/inventory/inner/innerOrder.vue
@@ -4,19 +4,20 @@
       <el-form :model="filterQuery" label-width="100px">
         <el-row>
           <el-form-item label="单据号">
-            <el-input v-model="filterQuery.recordKey" style="width: 100%" placeholder="请输入单据号" clearable></el-input>
+            <el-input v-model="filterQuery.recordKey" style="width: 100%" placeholder="请输入单据号"
+                      clearable></el-input>
           </el-form-item>
           <el-form-item label="单据日期">
             <el-date-picker
-              style="width: 100%"
-              :picker-options="pickerOptions"
-              v-model="actDateRange"
-              type="daterange"
-              format="yyyy 年 MM 月 dd 日"
-              value-format="yyyy-MM-dd"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+                style="width: 100%"
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
             >
             </el-date-picker>
           </el-form-item>
@@ -62,11 +63,11 @@
       </el-table>
 
       <pagination
-        v-show="total>0"
-        :total="total"
-        :limit.sync="filterQuery.limit"
-        :page.sync="filterQuery.page"
-        @pagination="handleCurrentChange"
+          v-show="total>0"
+          :total="total"
+          :limit.sync="filterQuery.limit"
+          :page.sync="filterQuery.page"
+          @pagination="handleCurrentChange"
       ></pagination>
 
     </el-card>
@@ -86,33 +87,33 @@
     </el-card>
 
     <el-dialog
-      :title="formMap[formName]"
-      :visible.sync="newSpDistributionVisible"
-      width="80%"
-      v-if="newSpDistributionVisible"
-      @close='closeDialog'
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
+        :title="formMap[formName]"
+        :visible.sync="newSpDistributionVisible"
+        width="80%"
+        v-if="newSpDistributionVisible"
+        @close='closeDialog'
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
     >
       <pureApplyEdit
-        :closeDialog="closeDialog"
-        :idQuery="idQuery"
+          :closeDialog="closeDialog"
+          :idQuery="idQuery"
       ></pureApplyEdit>
     </el-dialog>
 
 
     <el-dialog
-      title="内部码标签打印"
-      :visible.sync="qrcodeExportVisible"
-      width="80%"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      v-if="qrcodeExportVisible"
-      @close='closeQRCodeExportDialog'
+        title="内部码标签打印"
+        :visible.sync="qrcodeExportVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="qrcodeExportVisible"
+        @close='closeQRCodeExportDialog'
     >
       <innerCodeDetail
-        :closeDialog="closeQRCodeExportDialog"
-        :inQuery="inQuery"
+          :closeDialog="closeQRCodeExportDialog"
+          :inQuery="inQuery"
       ></innerCodeDetail>
     </el-dialog>
 
@@ -205,6 +206,7 @@ export default {
         editStatus: 1,
       };
       this.actDateRange = [];
+      this.detailList = []
       this.getList();
     },
 
@@ -223,33 +225,33 @@ export default {
       }
 
       listInnerOrder(this.filterQuery)
-        .then((response) => {
-          if (response.code == 20000) {
-            this.list = response.data.list || [];
-            this.total = response.data.total || 0;
-          } else {
-            this.$message.error(response.message);
-          }
-          this.loading = false;
-        })
-        .catch(() => {
-          this.loading = false;
-          this.list = [];
-          this.total = 0;
-        });
+          .then((response) => {
+            if (response.code == 20000) {
+              this.list = response.data.list || [];
+              this.total = response.data.total || 0;
+            } else {
+              this.$message.error(response.message);
+            }
+            this.loading = false;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
     },
     handleDetail(row) {
       let query = {orderIdFk: row.recordKey};
       this.loading = true;
       listInnerOrderDetail(query) //查找该单号下的所有条码
-        .then((response) => {
-          this.detailList = response.data.list || [];
-          this.loading = false;
-        })
-        .catch(() => {
-          this.loading = false;
-          this.detailList = [];
-        });
+          .then((response) => {
+            this.detailList = response.data.list || [];
+            this.loading = false;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.detailList = [];
+          });
     },
     submitOrder(row) {
       this.loading = true;
@@ -258,18 +260,18 @@ export default {
         purApplyEntity: row,
       }
       inserThrOrderWeb(tQuery)
-        .then(response => {
-          this.loading = false;
-          if (response.code === 20000) {
-            this.$message.success("提交成功！");
-            this.getList();
-          } else {
-            this.$message.error(response.message);
-          }
-        })
-        .catch(() => {
-          this.loading = false;
-        })
+          .then(response => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success("提交成功！");
+              this.getList();
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          })
     },
     deleteDialog(row) {
       this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
@@ -277,25 +279,25 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       })
-        .then(() => {
-          delInnerOrder(row.id)
-            .then((response) => {
-              this.loading = false;
-              if (response.code == 20000) {
-                this.$message.success("删除成功");
-                this.getList();
-                this.detailList = "";
-              } else {
-                this.$message.error(response.message);
-              }
-            })
-            .catch(() => {
-              this.loading = false;
-            });
+          .then(() => {
+            delInnerOrder(row.id)
+                .then((response) => {
+                  this.loading = false;
+                  if (response.code == 20000) {
+                    this.$message.success("删除成功");
+                    this.getList();
+                    this.detailList = "";
+                  } else {
+                    this.$message.error(response.message);
+                  }
+                })
+                .catch(() => {
+                  this.loading = false;
+                });
 
-        })
-        .catch(() => {
-        });
+          })
+          .catch(() => {
+          });
     },
     handleCurrentChange(val) {
       this.filterQuery.page = val.page;

From 84732c0ddcf86f679ad76d3fda5f79ac1d237e3e Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 6 Jul 2023 09:57:11 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.env.production b/.env.production
index d4bcb835..346d8083 100644
--- a/.env.production
+++ b/.env.production
@@ -18,14 +18,13 @@ ENV = 'production'
 # 文明东1
 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
 # 文明东2
-# VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
-# VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER"
+VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
 
 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
 
 # 平潭正式
-VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 # 吴总测试服务器
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'