导出修改

3 months ago · 9e779af576
parent 0f22cc5ef8
commit 9e779af576
7 changed files with 1072 additions and 56 deletions
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java
@ -275,7 +275,7 @@ public class VoucherController {
        }
        //数据转换
        realList = generaterSwapUtil.swapDataList(realList, VoucherConstant.getFormData(), VoucherConstant.getColumnData(), voucherPagination.getModuleId(),false);
-        String[]keys=!StringUtil.isEmpty(voucherPagination.getSelectKey())?voucherPagination.getSelectKey():new String[0];
+            String[]keys=!StringUtil.isEmpty(voucherPagination.getSelectKey())?voucherPagination.getSelectKey():new String[0];
        UserInfo userInfo=userProvider.get();
            DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo);
        return ActionResult.success(vo);
@ -378,6 +378,9 @@ public class VoucherController {
                    case "associatedDocumentNo" :
                    entitys.add(new ExcelExportEntity("关联单据号" ,"associatedDocumentNo"));
                    break;
+                    case "saleAmount" :
+                        entitys.add(new ExcelExportEntity("销售额" ,"saleAmount"));
+                        break;
                    case "orderNo" :
                    entitys.add(new ExcelExportEntity("订单序号" ,"orderNo"));
                    break;
@ -400,7 +403,10 @@ public class VoucherController {
                    tableField111List.add(new ExcelExportEntity("扣重" ,"buckleWeight"));
                    break;
                    case "tableField111-netWeight":
-                    tableField111List.add(new ExcelExportEntity("净重" ,"netWeight"));
+                    tableField111List.add(new ExcelExportEntity("结算量" ,"netWeight"));
+                        break;
+                    case "tableField111-clearWeight":
+                        tableField111List.add(new ExcelExportEntity("净重" ,"clearWeight"));
                    break;
                    case "tableField111-remark":
                    tableField111List.add(new ExcelExportEntity("备注" ,"remark"));
--- a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue
@ -1496,6 +1496,9 @@ export default {
      }, {
        "label": "名称",
        "value": "subjectName"
+      }, {
+        "label": "所属业务线",
+        "value": "businessName"
      },],
      cwaccountcontractsubjectcolumnOptions: [{
        "label": "主体名称",
@ -2324,7 +2327,9 @@ export default {
      this.isEdit = false
      this.childIndex = -1
    },
+
    addcwaccountcontractList() {
+
      if (!this.dataForm.cwaccountsubjectList[0] || this.dataForm.cwaccountsubjectList[0].subjectId == '') {
        this.$message({
          type: 'error',
@ -2333,6 +2338,16 @@ export default {
        })
        return
      }
+
+      if (this.dataForm.cwaccountcontractList.length >= 1) {
+        this.$message({
+          type: 'error',
+          message: '只能选一条合同',
+          duration: 1500,
+        })
+        return
+      }
+
      let item = {
        contractId: '',
        contractPeriodTime: undefined,
--- a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue
@ -1322,38 +1322,33 @@
          </el-col>

          <el-col :span="8">
-            <jnpf-form-tip-item label="事务处理类型"
-              prop="custTy">
-              <JnpfInput v-model="dataForm.custTy"
-                @change="changeData('settlableAmount',-1)" placeholder="请输入"
-                clearable :style='{"width":"100%"}'>
+            <jnpf-form-tip-item label="事务处理类型" prop="custTy">
+              <JnpfInput v-model="dataForm.custTy" @change="changeData('settlableAmount',-1)"
+                placeholder="请输入" clearable :style='{"width":"100%"}'>
              </JnpfInput>
            </jnpf-form-tip-item>
          </el-col>
          <el-col :span="8">
            <jnpf-form-tip-item label="发票日期" prop="invoiceDate">
              <JnpfDatePicker v-model="dataForm.invoiceDate" @change="changeData('startTime',-1)"
-                :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择"
-                :disabled="judgeWrite('settlableAmount')" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
+                :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
+                placeholder="请选择" :disabled="judgeWrite('settlableAmount')" clearable
+                :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
              </JnpfDatePicker>
            </jnpf-form-tip-item>
          </el-col>
          <el-col :span="8">
-            <jnpf-form-tip-item label="发票张数"
-              prop="invoiceCnt">
-              <JnpfInputNumber v-model="dataForm.invoiceCnt"
-                @change="changeData('invoiceCnt', -1)" placeholder="请输入"
-                :disabled="judgeWrite('settlableAmount')" addonAfter="张" clearable
+            <jnpf-form-tip-item label="发票张数" prop="invoiceCnt">
+              <JnpfInputNumber v-model="dataForm.invoiceCnt" @change="changeData('invoiceCnt', -1)"
+                placeholder="请输入" :disabled="judgeWrite('settlableAmount')" addonAfter="张" clearable
                :style='{ "width": "100%" }'>
              </JnpfInputNumber>
            </jnpf-form-tip-item>
          </el-col>
          <el-col :span="8">
-            <jnpf-form-tip-item label="发票编号"
-              prop="invoiceNo">
-              <JnpfInput v-model="dataForm.invoiceNo"
-                @change="changeData('settlableAmount',-1)" placeholder="请输入"
-                clearable :style='{"width":"100%"}'>
+            <jnpf-form-tip-item label="发票编号" prop="invoiceNo">
+              <JnpfInput v-model="dataForm.invoiceNo" @change="changeData('settlableAmount',-1)"
+                placeholder="请输入" clearable :style='{"width":"100%"}'>
              </JnpfInput>
            </jnpf-form-tip-item>
          </el-col>
@ -1366,55 +1361,44 @@
            </jnpf-form-tip-item>
          </el-col>
          <el-col :span="8">
-            <jnpf-form-tip-item label="发票编号"
-              prop="attribute11">
-              <JnpfInput v-model="dataForm.attribute11"
-                @change="changeData('attribute11',-1)" placeholder="请输入"
-                clearable :style='{"width":"100%"}'>
+            <jnpf-form-tip-item label="发票编号" prop="attribute11">
+              <JnpfInput v-model="dataForm.attribute11" @change="changeData('attribute11',-1)"
+                placeholder="请输入" clearable :style='{"width":"100%"}'>
              </JnpfInput>
            </jnpf-form-tip-item>
          </el-col>
          <el-col :span="8">
-            <jnpf-form-tip-item label="发票金额"
-              prop="invoiceAmount">
-              <JnpfInput v-model="dataForm.invoiceAmount"
-                @change="changeData('invoiceAmount',-1)" placeholder="请输入"
-                addonAfter="元" clearable :style='{"width":"100%"}'>
+            <jnpf-form-tip-item label="发票金额" prop="invoiceAmount">
+              <JnpfInput v-model="dataForm.invoiceAmount" @change="changeData('invoiceAmount',-1)"
+                placeholder="请输入" addonAfter="元" clearable :style='{"width":"100%"}'>
              </JnpfInput>
            </jnpf-form-tip-item>
          </el-col>
          <el-col :span="8">
            <jnpf-form-tip-item label="入账时间" prop="glDate">
              <JnpfDatePicker v-model="dataForm.glDate" @change="changeData('startTime',-1)"
-                :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择"
-                :disabled="judgeWrite('settlableAmount')" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
+                :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
+                placeholder="请选择" :disabled="judgeWrite('settlableAmount')" clearable
+                :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
              </JnpfDatePicker>
            </jnpf-form-tip-item>
          </el-col>
          <el-col :span="8">
-            <jnpf-form-tip-item label="摘要"
-              prop="description">
-              <JnpfInput v-model="dataForm.description"
-                @change="changeData('settlableAmount',-1)" placeholder="请输入"
-                clearable :style='{"width":"100%"}'>
+            <jnpf-form-tip-item label="摘要" prop="description">
+              <JnpfInput v-model="dataForm.description" @change="changeData('settlableAmount',-1)"
+                placeholder="请输入" clearable :style='{"width":"100%"}'>
              </JnpfInput>
            </jnpf-form-tip-item>
          </el-col>
          <el-col :span="8">
-            <jnpf-form-tip-item label="附件张数"
-              prop="annexCnt">
-              <JnpfInputNumber v-model="dataForm.annexCnt"
-                @change="changeData('annexCnt', -1)" placeholder="请输入"
-                :disabled="judgeWrite('settlableAmount')" addonAfter="张" clearable
+            <jnpf-form-tip-item label="附件张数" prop="annexCnt">
+              <JnpfInputNumber v-model="dataForm.annexCnt" @change="changeData('annexCnt', -1)"
+                placeholder="请输入" :disabled="judgeWrite('settlableAmount')" addonAfter="张" clearable
                :style='{ "width": "100%" }'>
              </JnpfInputNumber>
            </jnpf-form-tip-item>
          </el-col>

-
-
-
-
          <!-- <el-col :span="8" v-if="judgeShow('applyAmount')">
            <jnpf-form-tip-item label="申请金额" v-if="judgeShow('applyAmount')" prop="applyAmount">
              <JnpfInput v-model="dataForm.applyAmount" @change="changeData('applyAmount',-1)" placeholder="请输入"
@ -1467,8 +1451,8 @@
                    </JnpfPopupSelect>
                  </template>
                </el-table-column>
-                <el-table-column label="开票商品名称" v-if="judgeShow('cwsettlementsummary-itemNmInv')" prop="itemNmInv"
-                  align="center" width="200">
+                <el-table-column label="开票商品名称" v-if="judgeShow('cwsettlementsummary-itemNmInv')"
+                  prop="itemNmInv" align="center" width="200">
                  <template slot="header">
                    <span class="required-sign"
                      v-if="judgeRequired('cwsettlementsummaryList-itemNmInv')">*</span>开票商品名称
@ -1480,8 +1464,8 @@
                    </JnpfInput>
                  </template>
                </el-table-column>
-                <el-table-column label="摘要" v-if="judgeShow('cwsettlementsummary-description')" prop="description"
-                  align="center" width="200">
+                <el-table-column label="摘要" v-if="judgeShow('cwsettlementsummary-description')"
+                  prop="description" align="center" width="200">
                  <template slot="header">
                    <span class="required-sign"
                      v-if="judgeRequired('cwsettlementsummaryList-description')">*</span>摘要
@ -2146,6 +2130,9 @@ export default {
      }, {
        "label": "名称",
        "value": "subjectName"
+      }, {
+        "label": "所属业务线",
+        "value": "businessName"
      },],
      cwsettlementaccounttypeOptions: [{
        "fullName": "采购对账",
@ -2312,7 +2299,7 @@ export default {
      invoiceTypeOptions: [{
        "fullName": "红冲发票",
        "id": "1"
-      },{
+      }, {
        "fullName": "标准发票",
        "id": "2"
      }],
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
@ -48,9 +48,9 @@
          <el-col :span="6">
            <el-form-item label="是否生成销售发货凭证">
              <JnpfSelect v-model="query.isSaleDeliveryVoucher" placeholder="请选择" clearable
-                :options="isSaleDeliveryVoucherOptions" :props="isSaleDeliveryVoucherProps"
-                multiple>
+                :options="isSaleDeliveryVoucherOptions" :props="isSaleDeliveryVoucherProps">
              </JnpfSelect>
+
            </el-form-item>
          </el-col>

--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
@ -78,7 +78,7 @@
            <el-col :span="6">
              <el-form-item label="是否关联销售订单">
                <JnpfSelect v-model="query.isTransfer" placeholder="请选择" clearable
-                  :options="isTransferOptions" :props="isTransferProps" multiple>
+                  :options="isTransferOptions" :props="isTransferProps">
                </JnpfSelect>
              </el-form-item>
            </el-col>
@ -813,6 +813,7 @@ export default {
        }
      })
      newList.forEach(item => {
+
        if (item.children && item.children.length) {
          item.children.forEach((child, index) => {
            if (index == 0) {
@ -839,6 +840,7 @@ export default {
      })
    },
    getExportList(list) {
+      debugger
      let exportList = []
      for (let i = 0; i < list.length; i++) {
        if (list[i].jnpfKey === 'table') {
@ -991,6 +993,7 @@ export default {
      })
    },
    exportData() {
+      debugger
      this.exportBoxVisible = true
      this.$nextTick(() => {
        this.$refs.ExportBox.init(this.exportList)
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/superQueryJson.js
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/superQueryJson.js