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

src/views/houseSelfCollect/paymentManagement.vue

@@ -145,7 +145,7 @@
           </span>
           <el-button @click="settlement(2, scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.view`">查看
           </el-button>
-          <el-button  v-if="scope.row.approveStatus&&scope.row.reverseFlag!=1" @click="settleaccounts(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.view`">反结算
+          <el-button  v-if="scope.row.approveStatus&&scope.row.reverseFlag!=1" @click="settleaccounts(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.seet`">反结算
           </el-button>
           <el-button v-if="
               scope.row.approveStatus ||
@@ -310,7 +310,21 @@
         :preview-src-list="[paymentReceipt]">
       </el-image>
     </el-dialog>
-
+    <el-dialog width="50%" title="开票信息" :visible.sync="invoicingshow" :close="invoicingClose">
+       <el-form class="customer">
+        <el-form-item label="税控盘：">
+          <el-select v-model="invoiceFlag" placeholder="请选择税控盘"
+          filterable clearable style="margin: 0 10px">
+          <el-option v-for="item in invoicingList" :key="'invoicing'+item.value" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+        </el-form-item>
+      </el-form>
+        <span slot="footer" class="dialog-footer">
+        <el-button @click="invoicingshow = false">取 消</el-button>
+        <el-button type="primary" @click="invoicingconfirm">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -357,12 +371,14 @@
         paymentReceipt: '',
         isPreviewPayOrder: false,
         printType: 0,
+        invoiceFlag:'',
         isShowPrintType1: true,
         isShowPrintType2: true,
         isShowPrintType3: true,
         isShowPrintType4: true,
         customerInfo: false,
         form: {},
+        invoicingList:[{label:'航天信息',value:1},{label:'百旺',value:2}],
         formLabelWidth: '300px',
         invoicing: '',
         deleteshow: false,
@@ -405,6 +421,7 @@
         warehouseNameKey: '',
         warehouseName: '',
         isShowPrint: false,
+        invoicingshow:false,
         printData: {},
         warehouse: [],
         disabled: false,
@@ -442,6 +459,9 @@
       })
     },
     methods: {
+      invoicingClose(){
+        this.invoicingshow=false
+      },
       settleaccounts(row){
         this.$confirm('确定将该笔业务进行反结算操作？', '提示', {
           confirmButtonText: '确定',
@@ -606,21 +626,12 @@
           xmlhttp.send()
         })
       },
-      invoicingClick() {
-        // let data = JSON.stringify({
-        //   paymentManagementList : this.modification
-        // })
-        // //开票
-        //   invoicing(data)
-        //   .toPromise()
-        //   .then(response => {
-        //     console.log(response)
-        //   })
-
+      invoicingconfirm(){
         let data = {
           paymentManagementList: this.modification,
         }
         for (let i = 0; i < this.modification.length; i++) {
+          this.modification[i].invoiceFlag=this.invoiceFlag
           if (
             this.modification[i].status != '全部付款' &&
             this.modification[i].status != '部分付款' &&
@@ -647,6 +658,19 @@
           })
           .catch(() => {})
       },
+      invoicingClick() {
+        this.invoicingshow=true
+        // let data = JSON.stringify({
+        //   paymentManagementList : this.modification
+        // })
+        // //开票
+        //   invoicing(data)
+        //   .toPromise()
+        //   .then(response => {
+        //     console.log(response)
+        //   })
+
+      },
       customer(row) {
         getCustomerLook({
             id: row.identityId,

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -86,7 +86,7 @@
                   毛检
                 </ws-button>
               <ws-button v-hasPermission="
-           `warehouseManagement.warehouse.warehouseInfo.view`
+           `warehouseManagement.warehouse.warehouseInfo.huan`
           " class="putstorage" @click="exchange(scope.row)">
                   换仓
                 </ws-button>

src/views/warehouse/warehouseManagementRecord.vue

@@ -185,7 +185,7 @@
 							<!-- <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-if="scope.row.inOutType != '收购入库'&&scope.row.inOutType != '期初'&& scope.row.inOutType != '折转入库'&& scope.row.inOutType != '折转出库'"  v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
-							<el-button @click="back(scope.row)"   v-hasPermission="`acquisitionManagement.acquisitionWeight.view`">退回</el-button >
+							<el-button @click="back(scope.row)"   v-hasPermission="`acquisitionManagement.acquisitionWeight.tui`">退回</el-button >
 						</template>
 					</el-table-column>
 					<el-table-column prop="createDate" label="录入时间">