diff --git a/src/api/distribution/distributionStockArticle.js b/src/api/distribution/distributionStockArticle.js
index e76515f9..22b0c7e8 100644
--- a/src/api/distribution/distributionStockArticle.js
+++ b/src/api/distribution/distributionStockArticle.js
@@ -59,6 +59,7 @@ export const getQueryQRCode = (params) => {
   return request({
     url: '/api/logpm-distribution/distributionStockArticle/getShowTemplate',
     method: 'get',
+    responseType: 'blob',
     params: {
       ...params
     }
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index f93487b5..7086d249 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -247,7 +247,7 @@
         </div>
         <span slot="footer" class="dialog-footer">
 <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
-            <el-button type="primary" @click="printTemplate">打 印</el-button>
+<!--            <el-button type="primary" @click="printTemplate">打 印</el-button>-->
           <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
           <el-button @click="dialogVisible = false">取 消</el-button>
         </span>
@@ -703,7 +703,11 @@ export default {
       }
       getQueryQRCode(qr).then(res => {
         // this.form = res.data.data;
-        console.log("查看二维码",res.data.data);
+        this.qrCodeObj = [];
+        console.log("查看二维码",res.data);
+        let url = window.URL.createObjectURL(res.data);		// 获取返回参数中的需要的值data
+        console.log("什么鬼什么鬼；；；",url);
+        this.qrCodeObj.push(url);
       });
 
 
diff --git a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
index 0651f312..52865126 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
@@ -473,24 +473,33 @@ export default {
         this.store=[];
 
        let b = await getWarehouseDetail(a);
-        // console.log("bbbb",b.data.data);
+        console.log("bbbb",b.data.data);
         const da = b.data.data;
 
         this.options.push({
           label: da.customerName,
           value: da.clientId
         });
-        this.shop.push({
-          label: da.storeName,
-          value: da.storeId
-        })
+        if(!!da.storeId && da.storeId != '-1'){
+          console.log("门店》》》》");
+          this.shop.push({
+            label: da.storeName,
+            value: da.storeId
+          })
+        }
+
         if(this.store.length < 1){
           this.store.push({
-            label: da.warehouse,
-            value: da.warehouseId
+            label: !!da.warehouse ? da.warehouse : null ,
+            value: !!da.warehouseId ? da.warehouseId : null
           })
         }
         this.form = da;
+        // console.log(">>>>>>",this.form.storeId);
+        if(!!this.form.storeId && parseInt(this.form.storeId) == -1){
+          console.log(">>>>>>",this.form.storeId);
+          this.form.storeId = null;
+        }
         this.data = da.list;
         this.loading = false;
         if(!!ty && ty == "2"){
@@ -809,7 +818,13 @@ export default {
             //   this.$message.warning("请完善订单自编号！！");
             //   return ;
             // }
+            // if(parseInt(this.$route.query.type) == 3){
+            //
+            // }
             console.log("this.form",this.form);
+            if(!!this.form.totalInput && parseInt(this.form.totalInput) == '-1'){
+              this.form.totalInput = null;
+            }
             this.form.list = this.data;
             update(this.form).then(() => {
               this.box = false;