Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/contractManagement/purchaseContractExamine.vue

@@ -251,7 +251,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
-        <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+        <el-table-column prop="auditMind" label="审核意见"></el-table-column>
      </el-table>
     </ws-form>
     

src/views/contractManagement/salesContractAdd.vue

@@ -338,7 +338,7 @@
         :size-limit="size"
         @onChange="onChange" 
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" 
-        v-hasPermission="`contractManagement.salesContractsalesContractInfo.appl`"/>
+        v-hasPermission="`contractManagement.salesContract.salesContractInfo.appl`"/>
       </ws-form>
       <div v-if="dialogVisible" class="map">
         <map-drag @marker="marker" :isShowaddress="true" v-on:addressListen="getAddress" :type="type">

src/views/contractManagement/salesContractEdit.vue

@@ -342,7 +342,7 @@
           maxlength="200" />
         <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
           @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" v-hasPermission="
-            `contractManagement.salesContractsalesContractInfo.appl`"/>
+            `contractManagement.salesContract.salesContractInfo.appl`"/>
       </ws-form>
     </div>
     <div v-if="dialogVisible" class="map">

src/views/contractManagement/salesContractExamine.vue

@@ -356,7 +356,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
-        <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+        <el-table-column prop="auditMind" label="审核意见"></el-table-column>
      </el-table>
       <div style="text-align: right; padding: 10px">
         <el-button

src/views/houseSelfCollect/inspectionManagement.vue

@@ -268,6 +268,9 @@
 								this.warehouseCount = _wareHouse.count
 							} 
 						for (let i = 0; i < response.length; i++) {
+							if(response[i].warehouseName==_wareHouse.value){
+								this.warehouseCount = response[i].count
+							}
 							this.warehouseList.push({
 								value: response[i].warehouseName,
 								id: response[i].id,

src/views/houseSelfCollect/paymentManagement.vue

@@ -136,9 +136,7 @@
                   "
               @click="settlement(1, scope.row)"
             >结算</el-button>
-            
           </span>
-
           <el-button
             v-if="scope.row.approveStatus || scope.row.status == '已驳回'"
             @click="settlement(2, scope.row)"
@@ -343,6 +341,35 @@ export default {
       .toPromise()
       .then(response => {
         console.log(response)
+        //未完成，接口调通后替换假数据
+        response = {
+
+        }
+        response.data.imgList = [
+          {
+            name:'xml1',
+            src: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png"
+          },
+            {
+            name:'xml2',
+            src: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png"
+          },  {
+            name:'xml3',
+            src: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png"
+          }
+         ]
+        this.invoicingImgList = response.data.imgList
+        if(response.data.imgList.length>0){
+          for(let i = 0;i<response.data.imgList;i++){
+          //创建标签下载文件
+            let a = document.createElement("a");
+            a.href = response.data.imgList[i].src;
+            let urlArr = a.href.split(".");
+            a.setAttribute('download',response.data.imgList[i].name+".xml");
+            a.click();
+            a.remove();
+          }
+        }
       })
     },
     selectType(val) {

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -383,7 +383,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
-        <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+        <el-table-column prop="auditMind" label="审核意见"></el-table-column>
      </el-table>
     </div>
     <!-- 提交 -->

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -82,7 +82,7 @@
               @click="editClick(scope.row)" alt />
           </template>
         </el-table-column>
-        <el-table-column prop="establishDate" class="table_td" label="创建时间"></el-table-column>
+        <el-table-column prop="establishDate" class="table_td" label="创建时间" width="150"></el-table-column>
         <el-table-column prop="seller" label="操作" width="230">
           <template slot-scope="scope">
             <span class="corles" @click="nocomplete(scope.row)" v-hasPermission="

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -1598,7 +1598,6 @@
 				//     this.deliveryType = response
 				//   })
 				//仓库名
-				debugger
 				getwarehousename({
 						compId: this.compId,
 						warehouseType: 1

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -804,7 +804,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="createTime" label="审核时间"></el-table-column>
-      <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+      <el-table-column prop="auditMind" label="审核意见"></el-table-column>
     </el-table>
     <WinseaContentModal
       v-model="outerVisible"

src/views/warehouse/warehouseManagementRecord.vue

@@ -133,7 +133,7 @@
 						<template slot-scope="scope">
 							<!-- <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
 								src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" /> -->
-          					<el-button @click="print(scope.row)"  v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
+          					<el-button @click="print(scope.row)" v-if="scope.row.inOutType != '收购入库'"  v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
 
 						</template>
 					</el-table-column>