Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

public/static/warehousePrint.html

@@ -194,6 +194,7 @@
                  <th>皮重</th>
                  <th>净重</th>
             </tr>
+            <div>
           <tr class="row">
             <td class="col">买方</td>
             <td class="col">单位名称</td>
@@ -206,6 +207,7 @@
             <td class="col">{{ item.customerName}}</td>
             <td class="col">{{ item.customerName}}</td>
           </tr>
+        </div>
         </table>
         <!-- <div class="bottom">
         </div> -->

src/views/contractManagement/futuresPurchaseContract.vue

@@ -104,7 +104,7 @@
 						src="../../../public/img/bianji.png" @click="handleEdit(scope.row)" v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.edit`
             " alt="" />
-					<img width="16" height="17" v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'" style="
+					<img width="16" height="17" style="
               vertical-align: text-top;
               position: relative;
               top: -1px;

src/views/warehouse/warehouseManagementList.vue

@@ -432,6 +432,7 @@ export default {
            } = await postExport({startDate:this.parameter.startDate,endDate:this.parameter.endDate,warehouseName:this.parameter.warehouseName}, {}, {
           responseType: 'blob'
         }).toPromise()
+        debugger
         downloadFile({
           res: data,
           fileName: `${
@@ -829,17 +830,8 @@ export default {
       this.getList()
     },
     // async exportlist() {
-    //   const { data } = await export1(
-    //     {
-    //       compId: localStorage.getItem('ws-pf_compId'),
-    //       contractType: this.contractType,
-    //       currentPage: this.currentPage,
-    //       pageSize: this.pageSize,
-    //       searchType: this.searchType,
-    //       searchKeyWord: this.searchKeyWord,
-    //       startDate: this.startDate,
-    //       endDate: this.endDate,
-    //     },
+    //   const { data } = await postExport(
+    //   this.parameter,
     //     {},
     //     { responseType: 'blob' }
     //   ).toPromise()
@@ -847,7 +839,7 @@ export default {
     //     res: data,
     //     fileName: `${
     //       this.date.year + (this.date.month ? `-${this.date.month}` : '')
-    //     }_采购合同`,
+    //     }_采购合同1`,
     //     type: 'xls',
     //   })
     // },