Merge remote-tracking branch 'origin/master'

src/views/inout/DialogThrReviewOrder.vue

@@ -108,14 +108,14 @@
         </el-table-column>
         <el-table-column label="注册/备案号" width="150" prop="certCode"></el-table-column>
 
-        <el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">
+<!--        <el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">-->
-        </el-table-column>
+<!--        </el-table-column>-->
-        <el-table-column label="销售发票号（第一票）" width="180" prop="firstSalesInvNo">
+<!--        <el-table-column label="销售发票号（第一票）" width="180" prop="firstSalesInvNo">-->
-        </el-table-column>
+<!--        </el-table-column>-->
-        <el-table-column label="销售发票号（第二票）" width="180" prop="secSalesInvNo">
+<!--        <el-table-column label="销售发票号（第二票）" width="180" prop="secSalesInvNo">-->
-        </el-table-column>
+<!--        </el-table-column>-->
-        <el-table-column label="发票日期" width="150" prop="invoiceDate">
+<!--        <el-table-column label="发票日期" width="150" prop="invoiceDate">-->
-        </el-table-column>
+<!--        </el-table-column>-->
       </el-table>
     </el-card>
   </div>

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/dept/invWarehouse.vue

@@ -559,7 +559,6 @@ export default {
       if (formName === "edit") {
         this.subData = JSON.parse(JSON.stringify(data));
         this.subData.advanceType = this.subData.advanceType.toString();
-        this.query.advanceType=1;
         if (this.subData.parentCode != null && this.subData.parentCode != "") {
           this.isAdvanceTypeShow = true;
           this.isShow = false;
@@ -578,9 +577,6 @@ export default {
           this.subData = {advanceType: data.advanceType.toString(), spUse: false, parentCode: data.code};
         }
       }
-      //转换
-      let advanceTypese = this.subData.advanceType
-
 
       this.subFormVisible = true;
       this.getSubThrsysDetailData();
@@ -630,7 +626,6 @@ export default {
       }
     },
     forInvSubmit() {    // 新增，编辑---提交
-      this.subData.advanceType=1;
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
           saveSubWarehouse(this.subData, this.formName).then((response) => {

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>