Merge branch 'test'

# Conflicts:
#	src/views/thirdSys/inv/index.vue

src/views/inventory/supInoutSearchOrder.vue

@@ -191,6 +191,7 @@ export default {
         limit: 10,
         startAduditTime: null,
         endAduditTime: null,
+        actionType: "norDetail",
       };
       this.actDateRange=[]
       this.getList();
@@ -215,7 +216,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      this.filterQuery.actionType = this.actionType;
+      // this.filterQuery.actionType = this.actionType;
       getResultOrderList(this.filterQuery)
         .then((response) => {
           if (response.code === 20000) {

src/views/purchase/company/supCompanyEditDialog.vue

@@ -517,6 +517,7 @@ export default {
       this.inputQuery.mobile=row.mobile
       this.inputQuery.detailAddr=row.addr
       this.customerId=this.inputQuery.customerId;
+      this.getCompanyCertList();
     },
 
     cancelDialog() {

src/views/system/param/busTypeChange.vue

@@ -153,7 +153,8 @@ export default {
         1: "耗材领用",
         2: "产品申购",
         3: "采购计划",
-        4: "盘点转单"
+        4: "盘点转单",
+        5: "采购订单"
       },
       orderStatus: {
         1: "草稿",

src/views/system/print/pdfTmpleateManage.vue

@@ -106,7 +106,8 @@
               <el-select v-model="formData.module" @change="isCleck"  placeholder="模板类型" style="width: 100%" >
                 <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="2"></el-option>
+                <el-option label="扫码单据" value="3"></el-option>
               </el-select>
             </el-form-item>
           </el-col>