[生成分配统计报表]主页面+部分页面重置功能补充

src/assets/less/overwriter.css

@@ -10,3 +10,16 @@
   line-height: 40px;
   text-align: center;
 }
+.note-one,
+.note-two {
+  height: 100%;
+}
+.note-one .noteDetail,
+.note-two .noteDetail {
+  background-color: #f2f2f2;
+  padding: 10px;
+}
+.note-one /deep/ .ant-btn-primary,
+.note-two /deep/ .ant-btn-primary {
+  margin: 20px 0 10px 0;
+}

src/assets/less/overwriter.less

@@ -23,4 +23,14 @@
   text-align: center;
 }
 // 所有备注文本框 
-
+.note-one,
+.note-two {
+  height: 100%;
+  .noteDetail {
+    background-color: #f2f2f2;
+    padding: 10px;
+  }
+  /deep/ .ant-btn-primary {
+    margin: 20px 0 10px 0;
+  }
+}

src/views/reportForms/cost-allocation-table.vue

@@ -0,0 +1,377 @@
+<template>
+  <!-- 成本分配统计表 -->
+
+  <div id="costAllocationTable">
+    <!-- 是否需要 操作按钮 同步 -->
+    <!-- <div class="table-operator">
+      <a-button type="primary" @click="synchronization" icon="reload">同步</a-button>
+    </div> -->
+    <a-card :bordered="false">
+      <!-- 主表 -->
+      <a-row :gutter="24">
+        <div class="table-page-search-wrapper">
+          <a-form layout="inline">
+            <a-col :md="6" :sm="8">
+              <a-form-item label="计划单号">
+                <a-input v-model="costAllocation.planNum"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="产品款号" has-feedback>
+                <a-input v-model="costAllocation.poStyleNum"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="外销员">
+                <a-input v-model="costAllocation.exportSales"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="成衣合同号">
+                <a-input v-model="costAllocation.garmentContractNo"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="部门">
+                <a-input v-model="costAllocation.department"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="客户简称">
+                <a-input v-model="costAllocation.customerShortName"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="加工单位">
+                <a-input v-model="costAllocation.processUnit"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="出运日期">
+                <a-date-picker style="width: 100%" v-model="costAllocation.outData"></a-date-picker>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="计划数量">
+                <a-input v-model="costAllocation.planQuantity"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="美元外销总价">
+                <a-input v-model="costAllocation.USDTotalExportPrice"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="人民币费用支出">
+                <a-input
+                  v-model="costAllocation.RMBExpense"
+                  style="color:#027db4;"
+                  @click="mainTableExpenseCNY"
+                ></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="税率%">
+                <a-input v-model="costAllocation.taxRate"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="实际出货数量">
+                <a-input v-model="costAllocation.actualShipQuantity"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="人民币外销金额">
+                <a-input v-model="costAllocation.RMBExportAmount"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="美元费用支出">
+                <a-input
+                  v-model="costAllocation.USDExpense"
+                  style="color:#027db4;"
+                  @click="mainTableExpenseUSD"
+                ></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="加工费">
+                <a-input v-model="costAllocation.processCost"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="短出数">
+                <a-input v-model="costAllocation.shortSeveral"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="短出货值">
+                <a-input v-model="costAllocation.shortValue"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="短出面料成本">
+                <a-input v-model="costAllocation.fabricShortCost"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="事故单美金金额">
+                <a-input v-model="costAllocation.accidentUSDAmount"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="面料含税成本">
+                <a-input v-model="costAllocation.fabricCostIncludesTax"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="辅料含税成本">
+                <a-input v-model="costAllocation.excipienCostIncludesTax"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="销售订单本币总额">
+                <a-input v-model="costAllocation.salesOrdersLocalTotal"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="事故单人民币金额">
+                <a-input v-model="costAllocation.accidentCNYAmount"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="面料不含税成本">
+                <a-input v-model="costAllocation.fabricCostNotIncludesTax"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="辅料不含税成本">
+                <a-input v-model="costAllocation.excipienCostNotIncludesTax"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="销售订单原币总额">
+                <a-input v-model="costAllocation.salesOrdersOriginalTotal"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="制单人">
+                <a-input v-model="costAllocation.preparedBy"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <h4 style="color:red;">
+                标记
+                <span>（计算结果是负值时，该标记是红色）</span>
+              </h4>
+            </a-col>
+          </a-form>
+        </div>
+      </a-row>
+    </a-card>
+
+    <a-card style="margin:10px 0;">
+      <!--tabs 组件引入  -->
+      <tabs />
+
+      <!-- 事故单 -->
+      <div>
+        <h6 class="table-title">事故单</h6>
+        <a-table
+          rowKey="id"
+          :loading="loading"
+          :columns="accidentListColumns"
+          :data-source="accidentListData"
+          bordered
+          :pagination="false"
+        >
+          <!-- 事故单 -->
+          <span slot="accidentNum" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
+        </a-table>
+      </div>
+
+      <!-- 费用支出 -->
+      <div class="costPay-table" style="margin:40px 0">
+        <h6 class="table-title">费用支出</h6>
+        <a-table
+          rowKey="id"
+          :loading="loading"
+          :columns="costPayColumns"
+          :data-source="costPayData"
+          bordered
+          :pagination="false"
+        >
+        </a-table>
+      </div>
+
+      <!-- 备注信息 1 根据角色权限控制【填写】、【查看】-->
+      <div class="note-one" style="marginTop:40px;">
+        <h6 class="table-title">备注信息 1</h6>
+        <div class="noteDetail">
+          <a-input type="textarea" v-model="noteOne" placeholder="请输入备注 1" style="minHeight:100px;" />
+          <a-button type="primary" @click="savenoteOne">保存</a-button>
+        </div>
+      </div>
+
+      <!-- 备注信息 2 根据角色权限控制【填写】、【查看】-->
+      <div class="note-two" style="marginTop:40px;">
+        <h6 class="table-title">备注信息 2</h6>
+        <div class="noteDetail">
+          <a-input type="textarea" v-model="noteTwo" placeholder="请输入备注 2" style="minHeight:100px;" />
+          <a-button type="primary" @click="savenoteTwo">保存</a-button>
+        </div>
+      </div>
+    </a-card>
+
+    <!-- 所有弹框 -->
+    <div>
+      <!-- 主表费用支出 (人民币、美元共用)  弹框 -->
+      <mainTableExpenseCNY-modal ref="mainTableExpenseCNYModal" :father="aa"></mainTableExpenseCNY-modal>
+      <mainTableExpenseUSD-modal ref="mainTableExpenseUSDModal" :father="aa"></mainTableExpenseUSD-modal>
+      <!-- 事故单 -->
+      <!-- <accidentList-modal ref="accidentListModal" :father="aa"></accidentList-modal> -->
+      <!-- 抽屉 -->
+    </div>
+  </div>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import JEllipsis from '@/components/jeecg/JEllipsis'
+import moment from 'moment'
+import tabs from '@views/reportForms/cost-allocation-table/tabs.vue' // tabs组件
+import mainTableExpenseCNYModal from '@views/reportForms/cost-allocation-table/mainTableExpenseCNYModal.vue'
+import mainTableExpenseUSDModal from '@views/reportForms/cost-allocation-table/mainTableExpenseUSDModal.vue'
+
+export default {
+  name: 'CostAllocationTable', // 成本分配统计表
+  mixins: [JeecgListMixin],
+  components: { JEllipsis, moment, tabs, mainTableExpenseCNYModal, mainTableExpenseUSDModal },
+
+  data() {
+    return {
+      description: '成本分配统计表',
+      loading: false, // 表格加载
+      costAllocation: [], // 成本分配统计
+
+      noteOne: '', // 备注 1
+      noteTwo: '', // 备注 2
+
+      // 事故单 表头
+      accidentListColumns: [
+        {
+          title: '单号',
+          width: 120,
+          dataIndex: 'accidentNum',
+          className: 'replacecolor',
+          customCell: this.accidentListCustomCell,
+          scopedSlots: { customRender: 'accidentNum' }
+        },
+        { title: '事故承担方', width: 120, dataIndex: 'accidentUndertaker', className: 'replacecolor' },
+        { title: '金额', dataIndex: 'amount', width: 120, className: 'replacecolor' }
+      ],
+      accidentListData: [{ accidentNum: '1100011' }, {}],
+      // 费用支出 表头
+      costPayColumns: [
+        { title: '账套号', width: 120, dataIndex: 'setNo', className: 'replacecolor' },
+        { title: '支出单号', width: 120, dataIndex: 'disbursementSlipNo', className: 'replacecolor' },
+        { title: '费用项目', dataIndex: 'expenseItem', width: 120, className: 'replacecolor' },
+        { title: ' 支出本币金额', dataIndex: 'disbursedLocalMoney', width: 120, className: 'replacecolor' },
+        { title: '支出原币金额', dataIndex: 'disbursedOriginalMoney', width: 120, className: 'replacecolor' },
+        { title: '发票号', dataIndex: 'invoiceNum', width: 120, className: 'replacecolor' },
+        { title: '制单人', dataIndex: 'preparedBy', width: 120, className: 'replacecolor' }
+      ],
+      costPayData: [{}]
+    }
+  },
+  created() {},
+  methods: {
+    // 同步按钮  synchronization() {},
+
+    //  主表：人民币费用支出  弹框
+
+    mainTableExpenseCNY() {
+      console.log('点击:主表的人民币费用支出')
+      // if()
+      this.$refs.mainTableExpenseCNYModal.mainTableExpenseCNYModVis = true
+    },
+    // 主表：美元费用支出  弹框
+    mainTableExpenseUSD() {
+      console.log('点击:主表的美元费用支出')
+      // if()
+      this.$refs.mainTableExpenseUSDModal.mainTableExpenseUSDModVis = true
+    },
+
+    // 事故单 单号 弹框
+    accidentListCustomCell(record) {
+      return {
+        on: {
+          click: event => {
+            console.log('this:', this)
+            this.$refs.accidentListModal.accidentListModVis = true
+          }
+        }
+      }
+    },
+
+    // 保存备注 1
+    savenoteOne() {
+      console.log('保存 备注 1')
+    },
+    // 保存备注 2
+    savenoteTwo() {
+      console.log('保存 备注 2')
+    },
+    // father 抽屉方法
+    aa() {}
+  },
+  computed: {},
+  mounted() {}
+}
+</script>
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
+@import '~@assets/less/overwriter.less';
+/deep/ .ant-table-thead > tr > th {
+  text-align: center;
+  // font-weight: 700;
+}
+
+/deep/ .ant-table-tbody {
+  text-align: center;
+}
+
+// /deep/ th.replacecolor {
+//   background-color: #ccc;
+// }
+</style>

src/views/reportForms/cost-allocation-table/mainTableExpenseCNYModal.vue

@@ -0,0 +1,162 @@
+<template>
+  <!-- 成本分配 主表 人民币费用支出 弹框 -->
+  <a-modal
+    title="人民币费用支出"
+    v-model="mainTableExpenseCNYModVis"
+    :confirmLoading="confirmLoading"
+    width="86%"
+    style="top:330px;left:100px;"
+    :footer="null"
+  >
+    <!-- tabel 加载 -->
+    <a-spin :spinning="confirmLoading">
+      <!-- 查询  -->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="6" :sm="8">
+              <a-form-item label="账套号" v-model="queryParam.setNo">
+                <!--  -->
+                <a-input></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="供应商" v-model="queryParam.supplier">
+                <a-input></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+                <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+                <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+                <a @click="handleToggleSearch" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
+                </a>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+
+      <!-- table -->
+      <div>
+        <a-table
+          bordered
+          :loading="loading"
+          :columns="mainTableExpenseCNYColumns"
+          :data-source="mainTableExpenseCNYData"
+          :pagination="false"
+        >
+        </a-table>
+        <!-- 返回  -->
+        <a-row style="marginTop:20px;">
+          <a-col :md="24" :sm="12">
+            <span style="float: right;" class="table-operator">
+              <a-button type="primary" @click="backCostAllocationTable" icon="rollback">返回</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </div>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import JEllipsis from '@/components/jeecg/JEllipsis'
+export default {
+  name: 'MainTableExpenseCNYModVis', //  成本分配统计 主表 人民币费用支出
+  mixins: [JeecgListMixin],
+  components: { JEllipsis },
+  data() {
+    return {
+      loading: false, // 表格加载
+      // orderDataform: this.$form.createForm(this),
+      confirmLoading: false,
+      mainTableExpenseCNYModVis: false,
+      // 人民币费用支出 表头
+      mainTableExpenseCNYColumns: [
+        {
+          title: '账套号',
+          dataIndex: 'setNo',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '项目',
+          dataIndex: 'project',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '金额',
+          dataIndex: 'money',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '供应商',
+          dataIndex: 'supplier',
+          width: 120,
+          className: 'replacecolor'
+        }
+      ],
+      mainTableExpenseCNYData: [{}, {}],
+
+      // 查询条件
+      queryParam: {
+        setNo: '', // 账套号
+        supplier: '' // 供应商
+      }
+    }
+  },
+  // 接收父组件 方法
+  props: {
+    father: {
+      type: Function,
+      default: null
+    }
+  },
+  created() {},
+  methods: {
+    // 返回
+    backCostAllocationTable() {
+      console.log('返回成本分配统计表')
+      // this.$router.push('fabricLoss-table')
+      // this.invoiceNumModVis = false
+      this.close()
+    },
+    // 弹框查询按钮
+    searchQuery() {},
+    // 重置
+    searchReset() {
+      console.log('人民币重置查询条件')
+      this.queryParam = {}
+      // this.getShipmentList()
+    },
+    close() {
+      this.$emit('close')
+      this.mainTableExpenseCNYModVis = false
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
+@import '~@assets/less/overwriter.less';
+/deep/ .ant-table-thead > tr > th {
+  text-align: center;
+  // font-weight: 700;
+}
+
+/deep/ .ant-table-tbody {
+  text-align: center;
+}
+
+// /deep/ th.replacecolor {
+//   background-color: #ccc;
+// }
+</style>

src/views/reportForms/cost-allocation-table/mainTableExpenseUSDModal.vue

@@ -0,0 +1,164 @@
+<template>
+  <!-- 成本分配 主表 美元费用支出 弹框 -->
+  <a-modal
+    title="美元费用支出"
+    v-model="mainTableExpenseUSDModVis"
+    :confirmLoading="confirmLoading"
+    width="86%"
+    style="top:330px;left:100px;"
+    :footer="null"
+  >
+    <!-- tabel 加载 -->
+    <a-spin :spinning="confirmLoading">
+      <!-- 查询  -->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="6" :sm="8">
+              <a-form-item label="账套号">
+                <a-input placeholder="请输入账套号" v-model="queryParam.setNo"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="供应商">
+                <a-input placeholder="请输入供应商" v-model="queryParam.supplier"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <!-- 重置 -->
+            <a-col :md="6" :sm="8">
+              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+                <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+                <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+                <a @click="handleToggleSearch" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
+                </a>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+
+      <!-- table -->
+      <div>
+        <a-table
+          bordered
+          :loading="loading"
+          :columns="mainTableExpenseUSDColumns"
+          :data-source="mainTableExpenseUSDData"
+          :pagination="false"
+        >
+        </a-table>
+        <!-- 返回  -->
+        <a-row style="marginTop:20px;">
+          <a-col :md="24" :sm="12">
+            <span style="float: right;" class="table-operator">
+              <a-button type="primary" @click="backCostAllocationTable" icon="rollback">返回</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </div>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import JEllipsis from '@/components/jeecg/JEllipsis'
+export default {
+  name: 'MainTableExpenseUSDModVis', //  成本分配统计 主表 美元费用支出
+  mixins: [JeecgListMixin],
+  components: { JEllipsis },
+  data() {
+    return {
+      loading: false, // 表格加载
+      // orderDataform: this.$form.createForm(this),
+      confirmLoading: false,
+      mainTableExpenseUSDModVis: false,
+      // 表头
+      mainTableExpenseUSDColumns: [
+        {
+          title: '账套号',
+          dataIndex: 'setNo',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '项目',
+          dataIndex: 'project',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '金额',
+          dataIndex: 'money',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '供应商',
+          dataIndex: 'supplier',
+          width: 120,
+          className: 'replacecolor'
+        }
+      ],
+      mainTableExpenseUSDData: [{}, {}],
+
+      // 查询条件
+      queryParam: {
+        setNo: '', // 账套号
+        supplier: '' // 供应商
+      }
+    }
+  },
+  // 接收父组件 方法
+  props: {
+    father: {
+      type: Function,
+      default: null
+    }
+  },
+  created() {},
+  methods: {
+    // 返回
+    backCostAllocationTable() {
+      console.log('返回成本分配统计表')
+      // this.$router.push('fabricLoss-table')
+      // this.invoiceNumModVis = false
+      this.close()
+    },
+    // 弹框查询按钮
+    searchQuery() {},
+    // 重置
+    searchReset() {
+      console.log('美元重置查询条件')
+      this.queryParam = {}
+      // this.queryParam.setNo = ''
+      // this.queryParam.supplier = ''
+      // this.getShipmentList()
+    },
+    close() {
+      this.$emit('close')
+      this.mainTableExpenseUSDModVis = false
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
+@import '~@assets/less/overwriter.less';
+/deep/ .ant-table-thead > tr > th {
+  text-align: center;
+  // font-weight: 700;
+}
+
+/deep/ .ant-table-tbody {
+  text-align: center;
+}
+
+// /deep/ th.replacecolor {
+//   background-color: #ccc;
+// }
+</style>

src/views/reportForms/cost-allocation-table/tabs.vue

@@ -0,0 +1,516 @@
+<template>
+  <!-- 成本分配统计表  中tabs 部分 -->
+  <div id="tabs">
+    <a-tabs default-active-key="1" @change="tabsCallback">
+      <a-tab-pane key="1" tab="加工单位1">
+        <!-- tabs 面料 -->
+        <div>
+          <h6 class="table-title">面料</h6>
+          <a-table
+            rowKey="(item)=>item.id"
+            :loading="loading"
+            :columns="fabricColumns"
+            :data-source="fabricData"
+            bordered
+            :pagination="false"
+          >
+            <!-- 面料-转入数量 弹框-->
+            <span slot="fabricTransferQuantity" slot-scope="text">
+              <a>{{ text }}</a>
+            </span>
+
+            <!-- 面料-余下数量 弹框-->
+            <span slot="fabricRemainingQuantity" slot-scope="text">
+              <a>{{ text }}</a>
+            </span>
+          </a-table>
+        </div>
+
+        <!-- tabs 辅料 -->
+        <div style="margin:40px 0">
+          <h6 class="table-title">辅料</h6>
+          <a-table
+            rowKey="id"
+            :loading="loading"
+            :columns="ingredientsColumns"
+            :data-source="ingredientsData"
+            bordered
+            :pagination="false"
+            :scroll="{ x: 1500 }"
+          >
+            <!--辅料-转入数量 弹框-->
+            <span slot="ingredientsTransferQuantity" slot-scope="text">
+              <a>{{ text }}</a>
+            </span>
+            <!--辅料-余下数量 弹框-->
+            <span slot="ingredientsRemainingQuantity" slot-scope="text">
+              <a>{{ text }}</a>
+            </span>
+          </a-table>
+        </div>
+
+        <!-- tabs 发运明细 -->
+        <div>
+          <h6 class="table-title">发运明细</h6>
+          <a-table
+            rowKey="id"
+            :loading="loading"
+            :columns="shipDetailsColumns"
+            :data-source="shipDetailsData"
+            bordered
+            :pagination="false"
+            :scroll="{ x: 1500 }"
+          >
+          </a-table>
+        </div>
+
+        <!-- tabs 合计 信息 -->
+        <div style="margin:40px 0">
+          <h6 class="table-title">合计信息</h6>
+          <div style="border: 1px solid #e8e8e8;padding: 20px 20px 0 20px;">
+            <a-row :gutter="24">
+              <div class="table-page-search-wrapper">
+                <a-form layout="inline">
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="出货数量合计">
+                      <a-input v-model="totalInfo.shipmentQuantity"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="辅料金额合计">
+                      <a-input v-model="totalInfo.accessoriesAmount"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="辅料不含税金额合计">
+                      <a-input v-model="totalInfo.accessoriesExcludTax"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="出运美元外销总价">
+                      <a-input v-model="totalInfo.exportPriceUSD"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="出运加工费">
+                      <a-input v-model="totalInfo.shipProcesFees"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="面料不含税金额合计">
+                      <a-input v-model="totalInfo.fabricExcludTax"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="出运人民币外销金额">
+                      <a-input v-model="totalInfo.exportedAmountRMB"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="合计金额">
+                      <a-input v-model="totalInfo.amountTotal"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="面料金额合计">
+                      <a-input v-model="totalInfo.fabricAmount"></a-input>
+                    </a-form-item>
+                  </a-col>
+                </a-form>
+              </div>
+            </a-row>
+          </div>
+        </div>
+
+      </a-tab-pane>
+
+      <!-- 加工单位 2 -->
+      <a-tab-pane key="2" tab="加工单位2" force-render>
+        <!-- tabs 面料 -->
+        <div>
+          <h6 class="table-title">面料</h6>
+
+          <a-table
+            rowKey="id"
+            :loading="loading"
+            :columns="fabricColumns"
+            :data-source="fabricData"
+            bordered
+            :pagination="false"
+          >
+            <!-- 转入数量 弹框-->
+            <span slot="fabricTransferQuantity" slot-scope="text">
+              <a>{{ text }}</a>
+            </span>
+          </a-table>
+        </div>
+
+        <!-- tabs 辅料 -->
+        <div style="margin:40px 0">
+          <h6 class="table-title">辅料</h6>
+
+          <a-table
+            rowKey="id"
+            :loading="loading"
+            :columns="ingredientsColumns"
+            :data-source="ingredientsData"
+            bordered
+            :pagination="false"
+          >
+            <!-- 转入数量 弹框-->
+            <span slot="TransferQuantity" slot-scope="text">
+              <a>{{ text }}</a>
+            </span>
+          </a-table>
+        </div>
+
+        <!-- tabs 发运明细 -->
+        <div>
+          <h6 class="table-title">发运明细</h6>
+
+          <a-table
+            rowKey="id"
+            :loading="loading"
+            :columns="shipDetailsColumns"
+            :data-source="shipDetailsData"
+            bordered
+            :pagination="false"
+          >
+            <!-- 转入数量 弹框-->
+            <span slot="fabricTransferQuantity" slot-scope="text">
+              <a>{{ text }}</a>
+            </span>
+          </a-table>
+        </div>
+
+        <!-- tabs 合计信息 -->
+        <div style="margin:40px 0">
+          <h6 class="table-title">发运明细</h6>
+          <p>此处是主表信息的表单回显 方式</p>
+        </div>
+      </a-tab-pane>
+    </a-tabs>
+  </div>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import JEllipsis from '@/components/jeecg/JEllipsis'
+import moment from 'moment'
+export default {
+  name: 'Tabs', // 成本分配统计表  中tabs 部分
+  mixins: [JeecgListMixin],
+  components: { JEllipsis, moment },
+  data() {
+    return {
+      description: '成本分配统计表',
+      totalInfo: {}, // tabs 中合计信息
+      // 面料 表头
+      fabricColumns: [
+        /*
+          text     序号一列默认显示的数据
+          record   一行的所有数据
+          index    tbale表格数据的下标，即数组的下标
+        */
+        {
+          title: '序号',
+          width: 50,
+          dataIndex: 'index',
+          key: 'index',
+          customRender: (text, record, index) => `${index + 1}`,
+          className: 'replacecolor'
+        },
+        { title: '货物名称', width: 160, dataIndex: 'goodsName', className: 'replacecolor' },
+        {
+          title: '转入数量',
+          dataIndex: 'fabricTransferQuantity',
+          width: 120,
+          className: 'replacecolor',
+          customCell: this.fabricTransferQuantityCustomCell,
+          scopedSlots: { customRender: 'fabricTransferQuantity' }
+        },
+        {
+          title: '转入成本',
+          dataIndex: 'transferCost',
+          width: 120,
+          className: 'replacecolor'
+        },
+
+        { title: '单耗/件', dataIndex: 'unitConsumption', width: 120, className: 'replacecolor' },
+        { title: '使用数量', dataIndex: 'usageQuantity', width: 120, className: 'replacecolor' },
+        { title: '计划数量', dataIndex: 'planQuantity', width: 120, className: 'replacecolor' },
+        {
+          title: '购入数量',
+          dataIndex: 'purchaseQuantity',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '余下数量',
+          dataIndex: 'fabricRemainingQuantity',
+          width: 100,
+          className: 'replacecolor',
+          customCell: this.fabricRemainingQuantityCustomCell,
+          scopedSlots: { customRender: 'fabricRemainingQuantity' }
+        },
+        {
+          title: '损耗',
+          dataIndex: 'loss',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '余下数量的成本',
+          dataIndex: 'remainingQuantityCost',
+          width: 120,
+          className: 'replacecolor'
+        }
+      ],
+      fabricData: [
+        { fabricTransferQuantity: '8987', fabricRemainingQuantity: '67', loss: '1.17%' },
+        { fabricTransferQuantity: '6752', fabricRemainingQuantity: '37', loss: '1.17%' }
+      ],
+      // 辅料 表头
+      ingredientsColumns: [
+        {
+          title: '序号',
+          width: 90,
+          dataIndex: 'index',
+          key: 'index',
+          fixed: 'left',
+          customRender: (text, record, index) => `${index + 1}`,
+          className: 'replacecolor'
+        },
+        { title: '货物名称', width: 160, dataIndex: 'goodsName', fixed: 'left', className: 'replacecolor' },
+        {
+          title: '转入数量',
+          dataIndex: 'ingredientsTransferQuantity',
+          width: 120,
+          className: 'replacecolor',
+          customCell: this.ingredientsTransferQuantityCustomCell,
+          scopedSlots: { customRender: 'ingredientsTransferQuantity' }
+        },
+        {
+          title: '转入成本',
+          dataIndex: 'transferCost',
+          width: 120,
+          className: 'replacecolor'
+        },
+
+        { title: '使用数量', dataIndex: 'usageQuantity', width: 120, className: 'replacecolor' },
+        {
+          title: '购入数量',
+          dataIndex: 'purchaseQuantity',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '余下数量',
+          dataIndex: 'ingredientsRemainingQuantity',
+          width: 100,
+          className: 'replacecolor',
+          customCell: this.ingredientsRemainingQuantityCustomCell,
+          scopedSlots: { customRender: 'ingredientsRemainingQuantity' }
+        },
+        {
+          title: '损耗',
+          dataIndex: 'loss',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '人民币金额',
+          dataIndex: 'RMBAmount',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '美元金额',
+          dataIndex: 'USDAmount',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '不含税金额',
+          dataIndex: 'priceExcludingTax',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '转出率',
+          dataIndex: 'transferOutRate',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '进项税转出',
+          dataIndex: 'inputTaxTransferOut',
+          width: 160,
+          className: 'replacecolor'
+        },
+        {
+          title: '用量',
+          dataIndex: 'dosage',
+          width: 120,
+          className: 'replacecolor'
+        }
+      ],
+      ingredientsData: [
+        { ingredientsTransferQuantity: '7899', transferCost: '12536', ingredientsRemainingQuantity: '6698' }
+      ],
+      // 发运明细 表头
+      shipDetailsColumns: [
+        {
+          title: '序号',
+          width: 90,
+          dataIndex: 'index',
+          key: 'index',
+          fixed: 'left',
+          customRender: (text, record, index) => `${index + 1}`,
+          className: 'replacecolor'
+        },
+        { title: '发票号码', width: 180, dataIndex: 'invoiceNum', fixed: 'left', className: 'replacecolor' },
+        {
+          title: '出运日期',
+          dataIndex: 'outData',
+          width: 120,
+          className: 'replacecolor',
+          customCell: this.ingredientsTransferQuantityCustomCell,
+          scopedSlots: { customRender: 'ingredientsTransferQuantity' }
+        },
+        {
+          title: '汇率',
+          dataIndex: 'exchangeRate',
+          width: 120,
+          className: 'replacecolor'
+        },
+
+        { title: '订单号', dataIndex: 'orderNum', width: 120, className: 'replacecolor' },
+        {
+          title: '产品款号',
+          dataIndex: 'poStyleNum',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '出货数量',
+          dataIndex: 'shipQuantity',
+          width: 100,
+          className: 'replacecolor',
+          customCell: this.ingredientsRemainingQuantityCustomCell,
+          scopedSlots: { customRender: 'ingredientsRemainingQuantity' }
+        },
+        {
+          title: '外销单价',
+          dataIndex: 'loss',
+          width: 120,
+          className: 'exportUnitPrice'
+        },
+        {
+          title: '外销总价',
+          dataIndex: 'exportPrice',
+          width: 160,
+          className: 'replacecolor'
+        },
+        {
+          title: '人民币金额',
+          dataIndex: 'RMBAmount',
+          width: 160,
+          className: 'replacecolor'
+        },
+        {
+          title: '加工单价（人民币）',
+          dataIndex: 'procesUnitPriceRMB',
+          width: 160,
+          className: 'replacecolor'
+        },
+        {
+          title: '加工单价（美元）',
+          dataIndex: 'procesUnitPriceUSD',
+          width: 160,
+          className: 'replacecolor'
+        },
+        {
+          title: '加工费',
+          dataIndex: 'processCost',
+          width: 160,
+          className: 'replacecolor'
+        }
+      ],
+      shipDetailsData: [{ invoiceNum: '19TW-PRU-138S', outData: '2019-10-16', exchangeRate: '7.1338' }],
+
+    }
+  },
+  created() {
+    // 渲染订单销售列表
+  },
+  methods: {
+    // tbas
+    tabsCallback(key) {
+      console.log(key)
+    },
+    // 面料-转入数量 弹框
+    fabricTransferQuantityCustomCell() {},
+    // 面料-余下数量 弹框
+    fabricRemainingQuantityCustomCell() {},
+
+    // 辅料-转入数量 弹框
+    ingredientsTransferQuantityCustomCell() {},
+    // 辅料-余下数量 弹框
+    ingredientsRemainingQuantityCustomCell() {},
+
+    // 事故单 单号 弹框
+    accidentListCustomCell(record) {
+      return {
+        on: {
+          click: event => {
+            console.log('this:', this)
+            this.$refs.accidentListModal.accidentListModVis = true
+          }
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
+@import '~@assets/less/overwriter.less';
+/deep/ .ant-table-thead > tr > th {
+  text-align: center;
+  // font-weight: 700;
+}
+
+/deep/ .ant-table-tbody {
+  text-align: center;
+}
+
+// /deep/ th.replacecolor {
+//   background-color: #ccc;
+// }
+
+//小标签
+.table-title {
+  font-weight: 700;
+}
+
+// 合计信息  盒子
+.totalBox {
+}
+
+/deep/ .ant-tabs-nav .ant-tabs-tab-active {
+  font-size: 18px;
+}
+/deep/ .ant-tabs-nav .ant-tabs-tab {
+  font-size: 18px;
+}
+</style>

src/views/reportForms/fabric-loss-table.vue

@@ -94,7 +94,7 @@
           bordered
           :pagination="false"
         >
-          <!-- 采购数量 -->
+          <!-- 采购数量 弹框-->
           <span slot="purchaseQuantity" slot-scope="text">
             <a>{{ text }}</a>
           </span>
@@ -391,8 +391,8 @@ export default {
 
       // 委外订单国内 表头
       outsourceOrderColumns: [
-        { title: '制造工艺', width: 120, dataIndex: 'makeWorkmanship', key: '', className: 'replacecolor' },
-        { title: '工厂', width: 120, dataIndex: 'factory', key: '', className: 'replacecolor' },
+        { title: '制造工艺', width: 120, dataIndex: 'makeWorkmanship', className: 'replacecolor' },
+        { title: '工厂', width: 120, dataIndex: 'factory', className: 'replacecolor' },
         {
           title: '材料出库数量',
           dataIndex: 'materialsOutQuantityData',
@@ -416,7 +416,7 @@ export default {
         { title: '货物名称', dataIndex: 'goodsName', width: 100, className: 'replacecolor' },
         { title: '颜色', dataIndex: 'color', width: 120, className: 'replacecolor' },
         { title: '计划数量', dataIndex: 'planQuantity', width: 120, className: 'replacecolor' },
-        { title: '损耗', dataIndex: 'loss', key: '', wiclassName: 'replacecolor' },
+        { title: '损耗', dataIndex: 'loss', wiclassName: 'replacecolor' },
         { title: '多发少发', dataIndex: 'moreOrLess', width: 100, className: 'replacecolor' }
       ],
       outsourceOrderData: [
@@ -535,14 +535,14 @@ export default {
           title: '发票号码',
           width: 120,
           dataIndex: 'invoiceNum',
-          key: '',
+
           className: 'replacecolor',
           customCell: this.invoiceNumCustomCell,
           scopedSlots: { customRender: 'invoiceNum' }
         },
-        { title: '供应商', width: 120, dataIndex: 'supplier', key: '', className: 'replacecolor' },
-        { title: '采购发票金额', width: 120, dataIndex: 'PurchaseinvoiceCost', key: '', className: 'replacecolor' },
-        { title: '出运日期', width: 120, dataIndex: 'outData', key: '', className: 'replacecolor' }
+        { title: '供应商', width: 120, dataIndex: 'supplier', className: 'replacecolor' },
+        { title: '采购发票金额', width: 120, dataIndex: 'PurchaseinvoiceCost', className: 'replacecolor' },
+        { title: '出运日期', width: 120, dataIndex: 'outData', className: 'replacecolor' }
       ],
       costInvoiceFabricData: [
         { invoiceNum: '18TW-MYA-44', supplier: '供应商1', PurchaseinvoiceCost: '888.88', outData: '2018-05-04' },
@@ -552,15 +552,15 @@ export default {
 
       // 开票成本-成衣 表头
       costInvoiceClothesColumns: [
-        { title: '发票号码', width: 120, dataIndex: 'clInvoiceNum', key: '', className: 'replacecolor' },
-        { title: '委外供应商', width: 120, dataIndex: 'outsourceSupplier', key: '', className: 'replacecolor' },
-        { title: '成衣加工费', width: 120, dataIndex: 'clProcessCost', key: '', className: 'replacecolor' },
-        { title: '出运日期', width: 120, dataIndex: 'outData', key: '', className: 'replacecolor' },
-        { title: '入库数量', width: 120, dataIndex: 'inQuantity', key: '', className: 'replacecolor' },
+        { title: '发票号码', width: 120, dataIndex: 'clInvoiceNum', className: 'replacecolor' },
+        { title: '委外供应商', width: 120, dataIndex: 'outsourceSupplier', className: 'replacecolor' },
+        { title: '成衣加工费', width: 120, dataIndex: 'clProcessCost', className: 'replacecolor' },
+        { title: '出运日期', width: 120, dataIndex: 'outData', className: 'replacecolor' },
+        { title: '入库数量', width: 120, dataIndex: 'inQuantity', className: 'replacecolor' },
         {
           title: '发票数量',
           dataIndex: 'clInvoiceQuantity',
-          key: '',
+
           width: 120,
           className: 'replacecolor',
           customCell: this.clInvoiceQuantityCustomCell,
@@ -621,29 +621,28 @@ export default {
 
       // 费用支出 表头
       costPayColumns: [
-        { title: '账套号', width: 120, dataIndex: '', key: '', className: 'replacecolor' },
-        { title: '支出单号', width: 120, dataIndex: '', key: '', className: 'replacecolor' },
-        { title: '费用项目', dataIndex: '', key: '', width: 120, className: 'replacecolor' },
-        { title: ' 支出本币金额', dataIndex: '', key: '', width: 120, className: 'replacecolor' },
-        { title: '支出原币金额', dataIndex: '', key: '', width: 120, className: 'replacecolor' },
-        { title: '发票号', dataIndex: '', key: '', width: 120, className: 'replacecolor' },
-        { title: '制单人', dataIndex: '', key: '', width: 120, className: 'replacecolor' }
+        { title: '账套号', width: 120, dataIndex: 'setNo', className: 'replacecolor' },
+        { title: '支出单号', width: 120, dataIndex: 'disbursementSlipNo', className: 'replacecolor' },
+        { title: '费用项目', dataIndex: 'expenseItem', width: 120, className: 'replacecolor' },
+        { title: ' 支出本币金额', dataIndex: 'disbursedLocalMoney', width: 120, className: 'replacecolor' },
+        { title: '支出原币金额', dataIndex: 'disbursedOriginalMoney', width: 120, className: 'replacecolor' },
+        { title: '发票号', dataIndex: 'invoiceNum', width: 120, className: 'replacecolor' },
+        { title: '制单人preparedBy', width: 120, className: 'replacecolor' }
       ],
       costPayData: [{}],
 
-      // 事故单
+      // 事故单 表头
       accidentListColumns: [
         {
           title: '单号',
           width: 120,
           dataIndex: 'accidentNum',
-          key: '',
           className: 'replacecolor',
           customCell: this.accidentListCustomCell,
           scopedSlots: { customRender: 'accidentNum' }
         },
-        { title: '事故承担方', width: 120, dataIndex: '', key: '', className: 'replacecolor' },
-        { title: '金额', dataIndex: '', key: '', width: 120, className: 'replacecolor' }
+        { title: '事故承担方', width: 120, dataIndex: 'accidentUndertaker', className: 'replacecolor' },
+        { title: '金额', dataIndex: 'amount', width: 120, className: 'replacecolor' }
       ],
       accidentListData: [{ accidentNum: '1100011' }, { accidentNum: '3540011' }],
 
@@ -809,7 +808,7 @@ export default {
       }
     },
 
-    // 事故单
+    // 事故单 单号 弹框
     accidentListCustomCell(record) {
       return {
         on: {
@@ -887,17 +886,6 @@ export default {
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }
-.note-one,
-.note-two {
-  height: 100%;
-  .noteDetail {
-    background-color: #f2f2f2;
-    padding: 10px;
-  }
-  /deep/ .ant-btn-primary {
-    margin-top: 20px;
-  }
-}
 
 /deep/ .ant-table-footer .ant-table.body {
   // overflow: hidden !important;

src/views/reportForms/fabric-loss-table/accidentListModal.vue

@@ -15,7 +15,6 @@
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
               <a-form-item label="单号">
-                <!--  -->
                 <a-input v-model="accidentList.oddNum"></a-input>
               </a-form-item>
             </a-col>

src/views/reportForms/fabric-loss-table/fromSourceYarn.vue

@@ -14,14 +14,14 @@
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
-              <a-form-item label="纱批" v-model="queryParam.yarnNum">
-                <a-input></a-input>
+              <a-form-item label="纱批">
+                <a-input placeholder="请输入纱批" v-model="queryParam.yarnNum"></a-input>
               </a-form-item>
             </a-col>
 
             <a-col :md="6" :sm="8">
-              <a-form-item label="采购单价" v-model="queryParam.purchasePrice">
-                <a-input></a-input>
+              <a-form-item label="采购单价">
+                <a-input placeholder="请输入采购单价" v-model="queryParam.purchasePrice"></a-input>
               </a-form-item>
             </a-col>
 

src/views/reportForms/fabric-loss-table/invoiceNumModal.vue

@@ -14,15 +14,14 @@
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
-              <a-form-item label="物料" v-model="queryParam.material">
-                <!--  -->
-                <a-input></a-input>
+              <a-form-item label="物料">
+                <a-input placeholder="请输入物料" v-model="queryParam.material"></a-input>
               </a-form-item>
             </a-col>
 
             <a-col :md="6" :sm="8">
-              <a-form-item label="开票单价" v-model="queryParam.invoicingPrice">
-                <a-input></a-input>
+              <a-form-item label="开票单价">
+                <a-input placeholder="请输入开票单价" v-model="queryParam.invoicingPrice"></a-input>
               </a-form-item>
             </a-col>
 
@@ -142,8 +141,7 @@ export default {
     searchQuery() {},
     // 重置
     searchReset() {
-      this.queryParam.title = ''
-      this.queryParam.isRelease = ''
+      this.queryParam = {}
       // this.getShipmentList()
     },
     close() {

src/views/reportForms/fabric-loss-table/materialsOutQuantityModal.vue

@@ -15,25 +15,25 @@
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
               <a-form-item label="批号">
-                <a-input v-model="queryParam.batchNum"></a-input>
+                <a-input placeholder="请输入批号" v-model="queryParam.batchNum"></a-input>
               </a-form-item>
             </a-col>
 
             <a-col :md="6" :sm="8">
-              <a-form-item label="供应商" v-model="queryParam.supplier">
-                <a-input></a-input>
+              <a-form-item label="供应商">
+                <a-input placeholder="请输入供应商" v-model="queryParam.supplier"></a-input>
               </a-form-item>
             </a-col>
 
             <a-col :md="6" :sm="8">
-              <a-form-item label="物料编码" v-model="queryParam.materialCode">
-                <a-input></a-input>
+              <a-form-item label="物料编码">
+                <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
               </a-form-item>
             </a-col>
             <template v-if="toggleSearchStatus">
               <a-col :md="6" :sm="8">
-                <a-form-item label="物料名称" v-model="queryParam.materialName">
-                  <a-input></a-input>
+                <a-form-item label="物料名称">
+                  <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
                 </a-form-item>
               </a-col>
             </template>

src/views/reportForms/fabric-loss-table/otherYarnsIn.vue

@@ -14,14 +14,14 @@
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
-              <a-form-item label="委外订单号" v-model="queryParam.purchaseAboardOrderNum">
-                <a-input></a-input>
+              <a-form-item label="委外订单号">
+                <a-input placeholder="请输入委外订单号" v-model="queryParam.purchaseAboardOrderNum"></a-input>
               </a-form-item>
             </a-col>
 
             <a-col :md="6" :sm="8">
-              <a-form-item label="计划号" v-model="queryParam.planNum">
-                <a-input></a-input>
+              <a-form-item label="计划号">
+                <a-input placeholder="请输入计划号" v-model="queryParam.planNum"></a-input>
               </a-form-item>
             </a-col>
 

src/views/reportForms/fabric-loss-table/purchaseAmountModal.vue

@@ -15,13 +15,13 @@
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
               <a-form-item label="纱批">
-                <a-input v-model="queryParam.yarnNum"></a-input>
+                <a-input placeholder="请输入纱批" v-model="queryParam.yarnNum"></a-input>
               </a-form-item>
             </a-col>
 
             <a-col :md="6" :sm="8">
               <a-form-item label="采购单价">
-                <a-input v-model="queryParam.purchasePrice"></a-input>
+                <a-input placeholder="请输入采购单价" v-model="queryParam.purchasePrice"></a-input>
               </a-form-item>
             </a-col>
 

src/views/reportForms/fabric-loss-table/purchaseInQuantityModal.vue

@@ -14,15 +14,14 @@
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
-              <a-form-item label="下游委外订单号" v-model="queryParam.downAboardorderNum">
-                <!-- -->
-                <a-input></a-input>
+              <a-form-item label="下游委外订单号">
+                <a-input placeholder="请输入下游委外订单号" v-model="queryParam.downAboardorderNum"></a-input>
               </a-form-item>
             </a-col>
 
             <a-col :md="6" :sm="8">
-              <a-form-item label="委外订单号" v-model="queryParam.aboardorderNum">
-                <a-input></a-input>
+              <a-form-item label="委外订单号">
+                <a-input placeholder="请输入委外订单号" v-model="queryParam.aboardorderNum"></a-input>
               </a-form-item>
             </a-col>
 

src/views/reportForms/fabric-loss-table/surplusYarnModal.vue

@@ -14,14 +14,14 @@
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
-              <a-form-item label="委外订单号" v-model="queryParam.aboardorderNum">
-                <a-input></a-input>
+              <a-form-item label="委外订单号">
+                <a-input placeholder="请输入委外订单号" v-model="queryParam.aboardorderNum"></a-input>
               </a-form-item>
             </a-col>
 
             <a-col :md="6" :sm="8">
-              <a-form-item label="计划号" v-model="queryParam.planNum">
-                <a-input></a-input>
+              <a-form-item label="计划号">
+                <a-input placeholder="请输入计划号" v-model="queryParam.planNum"></a-input>
               </a-form-item>
             </a-col>
 

src/views/reportForms/pro-progress-report.vue

@@ -66,6 +66,7 @@
             </a-col>
           </template>
 
+          <!-- 重置 -->
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>