新增DI版本更新，单据类型修改

src/api/basic/product/udiRelevance.js

@@ -184,6 +184,15 @@ export function changeVersion(query) {
   });
 }
 
+export function syncOnline(query) {
+  return axios({
+    url: "/udi/udirel/syncOnline",
+    method: "post",
+    data: query
+  });
+}
+
+
 export function getGgxhList(params) {
   return axios({
     url: "/udiwms/udiinfo/getGgxhList",

src/views/basic/busType/bussinessTypeModify.vue

@@ -529,7 +529,7 @@
                 <el-select v-model="inputQuery.checkWebNew" 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>
@@ -552,7 +552,7 @@
                 <el-select v-model="inputQuery.checkPdaUn" 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>
@@ -575,7 +575,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>
@@ -598,7 +598,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>
@@ -621,7 +621,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>
@@ -644,7 +644,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>
@@ -666,7 +666,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>
@@ -689,7 +689,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>
@@ -711,7 +711,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>
@@ -723,6 +723,8 @@
                 <span class="sptext">手工补单的单据</span>
               </el-col>
             </el-row>
+            <el-divider></el-divider>
+
           </div>
         </el-collapse-item>
         <el-collapse-item title="是否人工核对单据设置(一次审核)">
@@ -1140,6 +1142,7 @@
                 <span class="sptext">手工补单的单据</span>
               </el-col>
             </el-row>
+            <el-divider></el-divider>
           </div>
         </el-collapse-item>
       </el-collapse>

src/views/basic/product/UdiinfoSelectVersion.vue

@@ -63,6 +63,7 @@
               >选入
               </el-button
               >
+
             </template>
           </el-table-column>
 

src/views/basic/product/product.vue

@@ -164,32 +164,38 @@
           <div class="top-right-btn">
             <el-button-group>
               <el-button icon="el-icon-view" type="primary" @click="hideSearch"
-                >显示/隐藏搜索栏</el-button
+              >显示/隐藏搜索栏
+              </el-button
               >
               <el-button type="primary" icon="el-icon-refresh" @click="onReset"
-                >重置</el-button
+              >重置
+              </el-button
               >
               <el-button type="primary" icon="el-icon-search" @click="submit"
-                >查询</el-button
+              >查询
+              </el-button
               >
               <!--              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">物资分类管理</el-button>-->
               <el-button
                 type="primary"
                 icon="el-icon-plus"
                 @click="intentImportUdi"
-                >选入DI信息</el-button
+              >选入DI信息
+              </el-button
               >
               <el-button
                 type="primary"
                 icon="el-icon-plus"
                 @click="intentImportErp"
-                >添加院内字典</el-button
+              >添加院内字典
+              </el-button
               >
               <el-button
                 type="primary"
                 icon="el-icon-plus"
                 @click="intentDetail"
-                >关联添加</el-button
+              >关联添加
+              </el-button
               >
             </el-button-group>
           </div>
@@ -1206,7 +1212,6 @@
                     <template slot="title">
                       <p class="form-title">版本信息</p>
                     </template>
-
                     <el-row :gutter="20" class="el-row" type="flex">
                       <el-col :span="12" class="el-col">
                         <div class="text item">
@@ -1220,6 +1225,9 @@
                             splaceholder="请输入内容"
                             v-model="editQuery.versionNumber"
                           ></el-input>
+                        </div>
+                      </el-col>
+                      <el-col :span="2" class="el-col">
                         <el-button
                           type="text"
                           size="small"
@@ -1227,7 +1235,13 @@
                           style="margin-left: 5%"
                         >切换版本
                         </el-button>
-                        </div>
+                      </el-col>
+                      <el-col :span="2" class="el-col">
+                        <el-button type="text" size="small" @click.native.stop="updateVersion()"
+                                   :loading="updateLoading"
+                                   style="margin-left: 5%"
+                        >更新当前版本信息
+                        </el-button>
                       </el-col>
                     </el-row>
                   </el-collapse-item>
@@ -1436,7 +1450,7 @@ import {
   spcombie,
   lockStatus,
   removeDiRl,
-  disableUdi,
+  disableUdi, syncOnline,
 } from "@/api/basic/product/udiRelevance";
 import {
   selectSysParamByKey,
@@ -1454,6 +1468,7 @@ import productUdiType from "@/views/basic/product/productUdiType";
 import selectHospProduct from "@/views/basic/product/bindHospProduct";
 import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
 import {getBasicHospType, getListTree} from "@/api/basic/basicHospType";
+import {dlLastVersionByDi} from "@/api/basic/udiInfo";
 
 export default {
   data() {
@@ -1551,6 +1566,7 @@ export default {
       lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
       activeNames: ["1"],
       useNumEnable: true,
+      updateLoading: false,
     };
   },
   filters: {
@@ -1678,7 +1694,8 @@ export default {
             this.$message.error(response.message);
           }
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     deleteDialog(rowId) {
@@ -1690,7 +1707,8 @@ export default {
         .then(() => {
           this.deleteOrders(rowId);
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     intentDetail() {
@@ -1728,9 +1746,11 @@ export default {
                 this.$message.error(response.message);
               }
             })
-            .catch(() => {});
+            .catch(() => {
+            });
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     removeDi() {
@@ -1757,9 +1777,11 @@ export default {
                 this.$message.error(response.message);
               }
             })
-            .catch(() => {});
+            .catch(() => {
+            });
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     intentSelectErp(val) {
@@ -2045,7 +2067,8 @@ export default {
           var invlist = response.data || [];
           this.treeList = this.handleTree(invlist, "code", "parentCode");
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     addHospProduct(data) {
@@ -2075,8 +2098,40 @@ export default {
       }
       this.getList();
     },
+
+    updateVersion() {
+      this.$confirm("此操作将访问国家库查询最新版本信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          debugger
+          this.updateLoading = true;
+          let query = {uuid: this.editQuery.uuid, originUuid: this.editQuery.originUuid};
+          syncOnline(query)
+            .then((response) => {
+              this.updateLoading = false;
+              if (response.code == 20000) {
+                this.$message.success("更新成功！");
+                this.closeUdi();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.updateLoading = false;
+              this.udidlList = [];
+              this.total = 0;
+            });
+        })
+        .catch(() => {
+        });
+
+    },
+  },
+  mounted() {
   },
-  mounted() {},
   components: {
     ProductSingleEdit,
     ProductEdit,
@@ -2101,12 +2156,14 @@ export default {
 .tree {
   ::v-deep .el-tree-node {
     white-space: normal;
+
     .el-tree-node__content {
       height: 100%;
       align-items: start;
     }
   }
 }
+
 .itemTag {
   float: left;
   text-align: right;

src/views/supplier/company/basicCompanyproductDetail.vue

@@ -799,11 +799,23 @@
                     splaceholder="请输入内容"
                     v-model="editQuery.versionNumber"
                   ></el-input>
-                  <el-button type="text" size="small" @click.native.stop="selectVersion()"
+                </div>
+              </el-col>
+              <el-col :span="2" class="el-col">
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.native.stop="selectVersion()"
                   style="margin-left: 5%"
                 >切换版本
                 </el-button>
-                </div>
+              </el-col>
+              <el-col :span="2" class="el-col">
+                <el-button type="text" size="small" @click.native.stop="updateVersion()"
+                           :loading="updateLoading"
+                           style="margin-left: 5%"
+                >更新当前版本信息
+                </el-button>
               </el-col>
             </el-row>
 
@@ -881,7 +893,7 @@
 
 <script>
 import {updateById} from '@/api/basic/udiRelevance'
-import {removeDiRl, removeRl, thirdSysDetail, updatetSingleUdiInfo} from '@/api/basic/product/udiRelevance'
+import {removeDiRl, removeRl, syncOnline, thirdSysDetail, updatetSingleUdiInfo} from '@/api/basic/product/udiRelevance'
 import {filterByUuid} from '@/api/basic/udiInfo'
 
 import selectErp from "./udiInfoselectErpUdi";
@@ -937,6 +949,7 @@ export default {
 
       editSingleDiDialogVisible: false,
       selectErpDialogVisible: false,  //选入ERP产品
+      updateLoading: false,
     }
   },
 
@@ -1080,6 +1093,36 @@ export default {
         .catch(() => {
         });
     },
+    updateVersion() {
+      this.$confirm("此操作将访问国家库查询最新版本信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          debugger
+          this.updateLoading = true;
+          let query = {uuid: this.editQuery.uuid, originUuid: this.editQuery.originUuid};
+          syncOnline(query)
+            .then((response) => {
+              this.updateLoading = false;
+              if (response.code == 20000) {
+                this.$message.success("更新成功！");
+                this.closeUdi();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.updateLoading = false;
+              this.udidlList = [];
+              this.total = 0;
+            });
+        })
+        .catch(() => {
+        });
+
+    },
   },
 
   components: {

src/views/sync/SysUdimsConfig.vue

@@ -308,6 +308,13 @@
                   <el-option :value="2" label="由外向内"></el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item label="发票信息">
+                <el-select v-model="configQuery.orderInvoice" disabled>
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
             </el-form>
           </el-descriptions-item>
           <!-- 第三方基础信息 -->
@@ -816,6 +823,7 @@ export default {
         dbDiCompany: null,
         udiCodeLost: null,
         udiCodeRel: null,
+        orderInvoice: null,
       },
       checkedBusTypes: [],
       checkedToInBusTypes: [],