Merge remote-tracking branch 'origin/master'

zkqy-ui/src/views/system/financialManage/saleAccountsReceivableDetail.vue

@@ -81,7 +81,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="8">
+        <el-col :span="8">
           <el-form-item label="" prop="returnReceipt">
             <el-radio-group
               @change="handleQuery"
@@ -92,7 +92,7 @@
               <el-radio :label="''">全部</el-radio>
             </el-radio-group>
           </el-form-item>
-        </el-col> -->
+        </el-col>
         <el-col :span="8">
           <el-form-item class="ml20" label="" prop="billingType">
             <el-radio-group
@@ -212,6 +212,7 @@
         </template>
       </el-table-column>
       <el-table-column label="销售单号" align="center" prop="saleNo" />
+      <el-table-column label="通知单号" align="center" prop="noticeNumber" />
       <!-- <el-table-column label="产品编号" align="center" prop="productId" /> -->
       <el-table-column label="品名" align="center" prop="productName" />
       <el-table-column
@@ -256,7 +257,7 @@
         align="center"
         prop="settlementUnitName"
       />
-      <el-table-column label="通知单号" align="center" prop="noticeNumber" />
+
       <el-table-column label="开票" align="center" prop="billingFlag">
         <template slot-scope="scope">
           <el-checkbox
@@ -1095,6 +1096,12 @@ export default {
     },
     // 开票回调
     async billingFlagChange(row) {
+      let { accountingType } = row;
+      if (accountingType != "2" && accountingType != "3") {
+        this.$message.warning("当前账务类型不支持开票");
+        this.getList();
+        return;
+      }
       let billingFlag = row.billingFlag;
       if (billingFlag == 1) {
         //开票

zkqy-ui/src/views/system/financialManage/saleOtherCollectionReview.vue

@@ -154,11 +154,13 @@
       </el-table-column>
       <el-table-column label="客户" align="center" prop="customerName" />
       <el-table-column
-        label="经办人编号"
+        label="结算单位"
         align="center"
-        prop="personInCharge"
+        prop="settlementUnitName"
       />
-      <el-table-column label="付款方式" align="center" prop="paymentMethod">
+      <el-table-column label="收款金额" align="center" prop="amount" />
+      <el-table-column label="经办人" align="center" prop="personInCharge" />
+      <!-- <el-table-column label="付款方式" align="center" prop="paymentMethod">
         <template slot-scope="scope">
           <span>{{
             getDictLabel(
@@ -167,13 +169,12 @@
             )
           }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         label="出门证号"
         align="center"
         prop="travelCertificateNumber"
       />
-      <el-table-column label="部门" align="center" prop="deptName" />
       <!-- <el-table-column
         label="收款明细"
         align="center"
@@ -184,7 +185,7 @@
           {{ getDictLabel(scope.row.itemReceivable, "item_receivable") }}
         </template>
       </el-table-column>
-      <el-table-column label="金额" align="center" prop="amount" />
+      <!-- <el-table-column label="金额" align="center" prop="amount" /> -->
       <!-- <el-table-column label="记账标志" align="center" prop="bookkeepingFlag" /> -->
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -677,6 +678,8 @@ export default {
               amount: this.currentRow.amount,
               paymentMethod: this.currentRow.paymentMethod,
               collectionDetails: this.currentRow.collectionDetails,
+              otherCollectionDate: this.currentRow.otherCollectionDate,
+              settlementUnitId: this.currentRow.settlementUnitId,
             };
             // this.form.serialNumber = new Date().getTime();
             saleOtherCollectionPass(payLoad).then((response) => {

zkqy-ui/src/views/system/financialManage/waitDetailsReview.vue

@@ -154,6 +154,7 @@
         </template>
       </el-table-column>
       <el-table-column label="销售单号" align="center" prop="saleNo" />
+      <el-table-column label="通知单号" align="center" prop="noticeNumber" />
       <!-- <el-table-column label="产品编号" align="center" prop="productId" /> -->
       <el-table-column label="品名" align="center" prop="productName" />
       <el-table-column
@@ -198,7 +199,7 @@
         align="center"
         prop="settlementUnitName"
       />
-      <el-table-column label="通知单号" align="center" prop="noticeNumber" />
+
       <!-- <el-table-column label="回单" align="center" prop="returnReceipt">
         <template slot-scope="scope">
           <el-checkbox