Browse Source

【成本分配统计表】页面(剩余详情页“标记”字段)

liangyan0105 3 years ago
parent
commit
ad758a5e34

+ 7 - 1
src/views/order/orderList.vue

@@ -200,7 +200,13 @@ export default {
         { orderNum: 'AA002206503' },
         { orderNum: 'AA002200004' }
       ],
-      loading: false // 表格加载
+      loading: false, // 表格加载
+            // 查询条件
+      queryParam: {
+        index: '',
+        planNum: '',
+        customerShortName: ''
+      },
     }
   },
   created() {

+ 155 - 323
src/views/reportForms/cost-allocation-table.vue

@@ -1,359 +1,191 @@
 <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>
+  <!--成本分配汇总  -->
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <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.index"></a-input>
+            </a-form-item>
+          </a-col>
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="计划单号" has-feedback>
+              <a-input placeholder="请输入计划单号" v-model="queryParam.planNum"></a-input>
+            </a-form-item>
+          </a-col>
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="客户简称">
+              <a-input placeholder="请输入客户简称" v-model="queryParam.customerShortName"></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>
-      <!-- 主表费用支出 (人民币、美元共用)  弹框 -->
-      <mainTableExpenseCNY-modal ref="mainTableExpenseCNYModal" :father="aa"></mainTableExpenseCNY-modal>
-      <mainTableExpenseUSD-modal ref="mainTableExpenseUSDModal" :father="aa"></mainTableExpenseUSD-modal>
-      <!-- 事故单 -->
-      <!-- <accidentList-modal ref="accidentListModal" :father="aa"></accidentList-modal> -->
-      <!-- 抽屉 -->
+      <a-table
+        bordered
+        rowKey="id"
+        :columns="costAllocationColumns"
+        :data-source="costAllocationData"
+        :loading="loading"
+        :pagination="ipagination"
+        :scroll="{ x: 1500 }"
+        @change="handleTableChange"
+      >
+        <!-- 操作 -->
+        <span slot="operationSlot" slot-scope="text, record">
+          <a href="javascript:void(0);" @click="detail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a href="javascript:void(0);" @click="check(record)" style="color:green">审核</a>
+        </span>
+      </a-table>
     </div>
-  </div>
+
+    <!-- 详情 大抽屉 -->
+    <costAllocation-drawer ref="costAllocationDrawer" :father="aa" @ok="modalFormOk"></costAllocation-drawer>
+  </a-card>
 </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'
+import costAllocationDrawer from '@views/reportForms/cost-allocation-table/costAllocationDrawer.vue'
 
 export default {
-  name: 'CostAllocationTable', // 成本分配统计表
+  name: 'OrderList',
   mixins: [JeecgListMixin],
-  components: { JEllipsis, moment, tabs, mainTableExpenseCNYModal, mainTableExpenseUSDModal },
+  components: { JEllipsis, moment, costAllocationDrawer },
 
   data() {
-    return {
-      description: '成本分配统计表',
-      loading: false, // 表格加载
-      costAllocation: [], // 成本分配统计
+    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
 
-      noteOne: '', // 备注 1
-      noteTwo: '', // 备注 2
-
-      // 事故单 表头
-      accidentListColumns: [
+    return {
+      description: '成本分配汇总页面',
+
+      // 查询条件
+      queryParam: {
+        index: '',
+        planNum: '',
+        customerShortName: ''
+      },
+      // 成本分配汇总 表头
+      costAllocationColumns: [
+        {
+          title: '序号',
+          width: 90,
+          dataIndex: 'index',
+          customRender: (text, record, index) => `${index + 1}`,
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+        { title: '计划单号', width: 120, dataIndex: 'planNum', fixed: 'left', className: 'replacecolor' },
+        { title: '款号', width: 120, dataIndex: 'styleNum', className: 'replacecolor' },
+        { title: '业务员', width: 120, dataIndex: 'salesman', className: 'replacecolor' },
         {
-          title: '单号',
+          title: '部门',
           width: 120,
-          dataIndex: 'accidentNum',
+          dataIndex: 'department',
+          className: 'replacecolor'
+        },
+        { title: '客户简称', width: 150, dataIndex: 'customerShortName', className: 'replacecolor' },
+        { title: '加工单位', width: 120, dataIndex: 'processUnit', className: 'replacecolor' },
+        //  {
+        //   title: '创建时间',
+        //   dataIndex: 'createTime',
+        //   align: 'center',
+        //   sorter: true,
+        //   customRender: text => {
+        //     return moment(text).format('YYYY-MM-DD')
+        //   }
+        // },
+        { title: '出运日期', width: 120, dataIndex: 'outData', className: 'replacecolor' },
+        { title: '成衣件数', width: 90, dataIndex: 'clothesQuantity', className: 'replacecolor' },
+        { title: '销售美元', width: 120, dataIndex: 'SalesUSD', className: 'replacecolor' },
+        { title: '销售人民币', width: 120, dataIndex: 'SalesCNY', className: 'replacecolor' },
+        { title: '面料(不含税)', width: 120, dataIndex: 'FabricExcludedTax', className: 'replacecolor' },
+        { title: '辅料(不含税)', width: 120, dataIndex: 'ingredientsExcludedTax', className: 'replacecolor' },
+        { title: '加工费(CNY)', width: 120, dataIndex: 'processCostCNY', className: 'replacecolor' },
+        { title: '加工费(USD)', width: 120, dataIndex: 'processCostUSD', className: 'replacecolor' },
+        { title: '费用支出(汇总CNY)', width: 160, dataIndex: 'costPayTotalCNY', className: 'replacecolor' },
+        { title: '费用支出(汇总USD)', width: 160, dataIndex: 'costPayTotalUSD', className: 'replacecolor' },
+        { title: '事故单人民币金额', width: 160, dataIndex: 'accidentCNYAmount', className: 'replacecolor' },
+        {
+          title: '备注',
+          width: 180,
+          dataIndex: 'note',
+          customRender: t => ellipsis(t),
           className: 'replacecolor',
-          customCell: this.accidentListCustomCell,
-          scopedSlots: { customRender: 'accidentNum' }
+          scopedSlots: { customRender: 'note' }
         },
-        { title: '事故承担方', width: 120, dataIndex: 'accidentUndertaker', className: 'replacecolor' },
-        { title: '金额', dataIndex: 'amount', width: 120, className: 'replacecolor' }
+        {
+          title: '操作',
+          dataIndex: 'operation',
+          scopedSlots: { customRender: 'operationSlot' },
+          fixed: 'right',
+          width: 160,
+          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' }
+      costAllocationData: [
+        {
+          orderNum: 'AA002200001',
+          note: '跟Jeecg-Boot官网统一,单元格内容较多时,多出内容以“……”替代,鼠标移入显示全部内容(此处原型图上是弹框,)'
+        }
       ],
-      costPayData: [{}]
+      loading: false // 表格加载
     }
   },
-  created() {},
+  created() {
+    // 渲染订单销售列表
+  },
   methods: {
-    // 同步按钮  synchronization() {},
-
-    //  主表:人民币费用支出  弹框
+    // 同步 synchronization() {},
 
-    mainTableExpenseCNY() {
-      console.log('点击:主表的人民币费用支出')
-      // if()
-      this.$refs.mainTableExpenseCNYModal.mainTableExpenseCNYModVis = true
+    // 查询按钮
+    searchQuery() {
+      // 渲染成本分配统计表
     },
-    // 主表:美元费用支出  弹框
-    mainTableExpenseUSD() {
-      console.log('点击:主表的美元费用支出')
-      // if()
-      this.$refs.mainTableExpenseUSDModal.mainTableExpenseUSDModVis = true
+    searchReset() {
+      // console.log('>>>>重置')
+      this.queryParam = {}
+      // 重新成本分配统计表
     },
 
-    // 事故单 单号 弹框
-    accidentListCustomCell(record) {
-      return {
-        on: {
-          click: event => {
-            console.log('this:', this)
-            this.$refs.accidentListModal.accidentListModVis = true
-          }
-        }
-      }
+    // 操作 详情
+    detail(record) {
+      // 点击了详情
+      this.$refs.costAllocationDrawer.visible = true
     },
+    // 操作 审核
+    check() {},
 
-    // 保存备注 1
-    savenoteOne() {
-      console.log('保存 备注 1')
-    },
-    // 保存备注 2
-    savenoteTwo() {
-      console.log('保存 备注 2')
-    },
     // father 抽屉方法
     aa() {}
+
+    // 分页、排序、筛选变化时触发
+    // handleTableChange(pagination, filters, sorter) {
+    //   // console.log('当前页信息>>>>',pagination)
+    //   this.queryParam.pageNo = pagination.current
+    //   // this.getOrderList()
+    // }
   },
   computed: {},
   mounted() {}

+ 404 - 0
src/views/reportForms/cost-allocation-table/costAllocationDrawer.vue

@@ -0,0 +1,404 @@
+<template>
+  <!-- 成本分配详情-->
+  <div id="costAllocationDrawer">
+    <a-drawer
+      title="成本分配详情"
+      width="100%"
+      placement="right"
+      :closable="true"
+      :visible="visible"
+      @close="onClose"
+    >
+      <!-- 主表信息 -->
+      <a-card :bordered="false">
+        <div class="table-page-search-wrapper">
+          <a-form layout="inline">
+            <a-row :gutter="24">
+              <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-row>
+          </a-form>
+        </div>
+      </a-card>
+
+      <!-- 子表 -->
+      <a-card :bordered="false">
+
+        <!--tabs 组件引入  -->
+        <div style="marginTop:60px;">
+          <tabs />
+        </div>
+
+        <!-- 事故单 -->
+        <div style="margin:60px 0 40px 0">
+          <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>
+          <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>
+    </a-drawer>
+
+    <!-- 所有弹框 -->
+    <div>
+      <!-- 主表 人民币费用支出  弹框 -->
+      <mainTableExpenseCNY-modal ref="mainTableExpenseCNYModal" :father="aa"></mainTableExpenseCNY-modal>
+      <!-- 主表 美元费用支出  弹框 -->
+      <mainTableExpenseUSD-modal ref="mainTableExpenseUSDModal" :father="bb"></mainTableExpenseUSD-modal>
+      <!-- 事故单 -->
+      <accidentList-modal ref="accidentListModal" :father="cc"></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'
+
+import accidentListModal from '@views/reportForms/fabric-loss-table/accidentListModal.vue' // 事故单
+
+export default {
+  name: 'CostAllocationTable', // 成本分配统计表
+  mixins: [JeecgListMixin],
+  components: { JEllipsis, moment, tabs, mainTableExpenseCNYModal, mainTableExpenseUSDModal, accidentListModal },
+
+  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: [{}],
+      visible: false // 成本分配统计表详情  抽屉
+    }
+  },
+  created() {},
+  methods: {
+    // 同步按钮  synchronization() {},
+
+    //  主表:人民币费用支出  弹框
+    mainTableExpenseCNY() {
+      console.log('点击:主表人民币费用支出')
+      this.$refs.mainTableExpenseCNYModal.mainTableExpenseCNYModVis = true
+    },
+    // 主表:美元费用支出  弹框
+    mainTableExpenseUSD() {
+      console.log('点击:主表美元费用支出')
+      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')
+    },
+
+    onClose() {
+      // 关闭抽屉
+      this.visible = false
+    },
+
+    // --------------------------------------------------
+    // father 方法
+    aa() {},
+    bb() {},
+    cc() {}
+  },
+  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;
+// }
+
+/deep/ .ant-card-body {
+  padding: 0;
+}
+/deep/ .ant-tabs {
+  border: 6px solid rgba(24, 144, 255,.3);
+  padding: 12px;
+  border-radius: 12px;
+}
+</style>

+ 133 - 0
src/views/reportForms/cost-allocation-table/fabricRemainingQuantityModal.vue

@@ -0,0 +1,133 @@
+<template>
+  <!-- 成本分配统计表  面料 余下数量 -->
+  <a-modal
+    title="余下数量"
+    v-model="fabricRemainingQuantityModVis"
+    :confirmLoading="confirmLoading"
+    width="86%"
+    style="top:330px;left:100px;"
+    :footer="null"
+  >
+    <!-- tabel 加载 -->
+    <a-spin :spinning="confirmLoading">
+      <a-table
+        :loading="loading"
+        bordered
+        :columns="fabricRemainingQuantityColumns"
+        :data-source="fabricRemainingQuantityData"
+        :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" icon="download" @click="handleExportXls('转入数量')">导出</a-button>
+            <a-button type="primary" @click="print" icon="printer" style="margin:0 10px;">打印</a-button>
+            <a-button type="primary" @click="cancel" icon="rollback">取消</a-button>
+          </span>
+        </a-col>
+      </a-row>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import JEllipsis from '@/components/jeecg/JEllipsis'
+export default {
+  name: 'FabricRemainingQuantityModal', // 面料 余下数量 弹框
+  mixins: [JeecgListMixin],
+  components: { JEllipsis },
+  data() {
+    return {
+      // 面料- 余下数量 表头
+      fabricRemainingQuantityColumns: [
+        {
+          title: '存货名称',
+          dataIndex: 'inventoryName',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '颜色',
+          dataIndex: 'color',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '计划单号',
+          dataIndex: 'planNum',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '使用数量',
+          dataIndex: 'usageQuantity',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '单位成本',
+          dataIndex: 'unitCost',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '总成本',
+          dataIndex: 'totalCost',
+          width: 120,
+          className: 'replacecolor'
+        }
+      ],
+      fabricRemainingQuantityData: [{}],
+      loading: false, // 表格加载
+      // orderDataform: this.$form.createForm(this),
+      confirmLoading: false,
+     fabricRemainingQuantityModVis: false
+    }
+  },
+  // 接收父组件 方法
+  props: {
+    father: {
+      type: Function,
+      default: null
+    }
+  },
+  created() {},
+  methods: {
+    // 第一行 导出
+    // handleExportXls() {},
+    // 打印
+    print() {},
+    // 取消
+    cancel() {
+      console.log('返回成本分配统计表')
+      // this.$router.push('fabricLoss-table')
+      // this.fabricTransferQuantityModVis = false
+      this.close()
+    },
+
+    close() {
+      this.$emit('close')
+      this.fabricRemainingQuantityModVis = 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>

+ 133 - 0
src/views/reportForms/cost-allocation-table/fabricTransferQuantityModal.vue

@@ -0,0 +1,133 @@
+<template>
+  <!-- 成本分配统计表  面料 转入数量 -->
+  <a-modal
+    title="转入数量"
+    v-model="fabricTransferQuantityModVis"
+    :confirmLoading="confirmLoading"
+    width="86%"
+    style="top:330px;left:100px;"
+    :footer="null"
+  >
+    <!-- tabel 加载 -->
+    <a-spin :spinning="confirmLoading">
+      <a-table
+        :loading="loading"
+        bordered
+        :columns="fabricTransferQuantityColumns"
+        :data-source="fabricTransferQuantityData"
+        :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" icon="download" @click="handleExportXls('转入数量')">导出</a-button>
+            <a-button type="primary" @click="print" icon="printer" style="margin:0 10px;">打印</a-button>
+            <a-button type="primary" @click="cancel" icon="rollback">取消</a-button>
+          </span>
+        </a-col>
+      </a-row>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import JEllipsis from '@/components/jeecg/JEllipsis'
+export default {
+  name: 'FabricTransferQuantityModal', // 面料 转入数量 弹框
+  mixins: [JeecgListMixin],
+  components: { JEllipsis },
+  data() {
+    return {
+      // 面料- 转入数量 表头
+      fabricTransferQuantityColumns: [
+        {
+          title: '存货名称',
+          dataIndex: 'inventoryName',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '颜色',
+          dataIndex: 'color',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '计划单号',
+          dataIndex: 'planNum',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '转入数量',
+          dataIndex: 'transferQuantity',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '单位成本',
+          dataIndex: 'unitCost',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '总成本',
+          dataIndex: 'totalCost',
+          width: 120,
+          className: 'replacecolor'
+        }
+      ],
+      fabricTransferQuantityData: [{}],
+      loading: false, // 表格加载
+      // orderDataform: this.$form.createForm(this),
+      confirmLoading: false,
+      fabricTransferQuantityModVis: false
+    }
+  },
+  // 接收父组件 方法
+  props: {
+    father: {
+      type: Function,
+      default: null
+    }
+  },
+  created() {},
+  methods: {
+    // 第一行 导出
+    // handleExportXls() {},
+    // 打印
+    print() {},
+    // 取消
+    cancel() {
+      console.log('返回成本分配统计表')
+      // this.$router.push('fabricLoss-table')
+      // this.fabricTransferQuantityModVis = false
+      this.close()
+    },
+
+    close() {
+      this.$emit('close')
+      this.fabricTransferQuantityModVis = 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>

+ 127 - 0
src/views/reportForms/cost-allocation-table/ingredientsRemainingQuantityModal.vue

@@ -0,0 +1,127 @@
+<template>
+  <!-- 成本分配统计表  辅料 余下数量 -->
+  <a-modal
+    title="余下数量"
+    v-model="ingredientsRemainingQuantityModVis"
+    :confirmLoading="confirmLoading"
+    width="86%"
+    style="top:330px;left:100px;"
+    :footer="null"
+  >
+    <!-- tabel 加载 -->
+    <a-spin :spinning="confirmLoading">
+      <a-table
+        :loading="loading"
+        bordered
+        :columns="ingredientsRemainingQuantityColumns"
+        :data-source="ingredientsRemainingQuantityData"
+        :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" icon="download" @click="handleExportXls('转入数量')">导出</a-button>
+            <a-button type="primary" @click="print" icon="printer" style="margin:0 10px;">打印</a-button>
+            <a-button type="primary" @click="cancel" icon="rollback">取消</a-button>
+          </span>
+        </a-col>
+      </a-row>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import JEllipsis from '@/components/jeecg/JEllipsis'
+export default {
+  name: 'IngredientsRemainingQuantityModal', // 辅料 余下数量 弹框
+  mixins: [JeecgListMixin],
+  components: { JEllipsis },
+  data() {
+    return {
+      // 辅料 - 余下数量 表头
+      ingredientsRemainingQuantityColumns: [
+        {
+          title: '存货名称',
+          dataIndex: 'inventoryName',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '计划单号',
+          dataIndex: 'planNum',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '使用数量',
+          dataIndex: 'usageQuantity',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '单位成本',
+          dataIndex: 'unitCost',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '总成本',
+          dataIndex: 'totalCost',
+          width: 120,
+          className: 'replacecolor'
+        }
+      ],
+      ingredientsRemainingQuantityData: [{}],
+      loading: false, // 表格加载
+      // orderDataform: this.$form.createForm(this),
+      confirmLoading: false,
+      ingredientsRemainingQuantityModVis: false
+    }
+  },
+  // 接收父组件 方法
+  props: {
+    father: {
+      type: Function,
+      default: null
+    }
+  },
+  created() {},
+  methods: {
+    // 第一行 导出
+    // handleExportXls() {},
+    // 打印
+    print() {},
+    // 取消
+    cancel() {
+      console.log('返回成本分配统计表')
+      // this.$router.push('fabricLoss-table')
+      // this.ingredientsRemainingQuantityModVis = false
+      this.close()
+    },
+
+    close() {
+      this.$emit('close')
+      this.ingredientsRemainingQuantityModVis = 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>

+ 128 - 0
src/views/reportForms/cost-allocation-table/ingredientsTransferQuantityModal.vue

@@ -0,0 +1,128 @@
+<template>
+  <!-- 成本分配统计表  辅料 转入数量 -->
+  <a-modal
+    title="转入数量"
+    v-model="ingredientsTransferQuantityModVis"
+    :confirmLoading="confirmLoading"
+    width="86%"
+    style="top:330px;left:100px;"
+    :footer="null"
+  >
+    <!-- tabel 加载 -->
+    <a-spin :spinning="confirmLoading">
+      <a-table
+        :loading="loading"
+        bordered
+        :columns="ingredientsTransferQuantityColumns"
+        :data-source="ingredientsTransferQuantityData"
+        :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" icon="download" @click="handleExportXls('转入数量')">导出</a-button>
+            <a-button type="primary" @click="print" icon="printer" style="margin:0 10px;">打印</a-button>
+            <a-button type="primary" @click="cancel" icon="rollback">取消</a-button>
+          </span>
+        </a-col>
+      </a-row>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import JEllipsis from '@/components/jeecg/JEllipsis'
+export default {
+  name: 'IngredientsTransferQuantityModal', // 辅料 转入数量 弹框
+  mixins: [JeecgListMixin],
+  components: { JEllipsis },
+  data() {
+    return {
+      // 辅料- 转入数量 表头
+      ingredientsTransferQuantityColumns: [
+        {
+          title: '存货名称',
+          dataIndex: 'inventoryName',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '计划单号',
+          dataIndex: 'planNum',
+          width: 120,
+          className: 'replacecolor'
+        },
+
+        {
+          title: '转入数量',
+          dataIndex: 'transferQuantity',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '单位成本',
+          dataIndex: 'unitCost',
+          width: 120,
+          className: 'replacecolor'
+        },
+        {
+          title: '总成本',
+          dataIndex: 'totalCost',
+          width: 120,
+          className: 'replacecolor'
+        }
+      ],
+      ingredientsTransferQuantityData: [{}],
+      loading: false, // 表格加载
+      // orderDataform: this.$form.createForm(this),
+      confirmLoading: false,
+      ingredientsTransferQuantityModVis: false
+    }
+  },
+  // 接收父组件 方法
+  props: {
+    father: {
+      type: Function,
+      default: null
+    }
+  },
+  created() {},
+  methods: {
+    // 第一行 导出
+    // handleExportXls() {},
+    // 打印
+    print() {},
+    // 取消
+    cancel() {
+      console.log('返回成本分配统计表')
+      // this.$router.push('fabricLoss-table')
+      // this.ingredientsTransferQuantityModVis = false
+      this.close()
+    },
+
+    close() {
+      this.$emit('close')
+      this.ingredientsTransferQuantityModVis = 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>

+ 4 - 2
src/views/reportForms/cost-allocation-table/mainTableExpenseCNYModal.vue

@@ -133,8 +133,10 @@ export default {
     searchQuery() {},
     // 重置
     searchReset() {
-      console.log('人民币重置查询条件')
-      this.queryParam = {}
+      // console.log('人民币重置查询条件')
+      // this.queryParam = {}
+      this.queryParam.setNo = ''
+      this.queryParam.supplier = ''
       // this.getShipmentList()
     },
     close() {

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

@@ -134,9 +134,9 @@ export default {
     // 重置
     searchReset() {
       console.log('美元重置查询条件')
-      this.queryParam = {}
-      // this.queryParam.setNo = ''
-      // this.queryParam.supplier = ''
+      // this.queryParam = {}
+      this.queryParam.setNo = ''
+      this.queryParam.supplier = ''
       // this.getShipmentList()
     },
     close() {

+ 1 - 0
src/views/reportForms/fabric-loss-table.vue

@@ -828,6 +828,7 @@ export default {
     savenoteTwo() {
       console.log('保存 备注 2')
     },
+
     aa() {} // father
   },
 

+ 11 - 2
src/views/reportForms/pro-progress-report.vue

@@ -127,6 +127,8 @@ export default {
   components: { JEllipsis, moment, singleOrderReportDrawer },
 
   data() {
+    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
+
     return {
       description: '生产进度报表',
       // 表头
@@ -157,9 +159,15 @@ export default {
           className: 'replacecolor'
         },
         { title: '物料编号(多个分行显示)', width: 210, dataIndex: 'materialNum', className: 'replacecolor' },
-        { title: '物料名称', width: 210, dataIndex: 'materialName', className: 'replacecolor' },
+        {
+          title: '物料名称',
+          width: 210,
+          dataIndex: 'materialName',
+          customRender: t => ellipsis(t),
+          className: 'replacecolor'
+        },
         { title: '款号', width: 90, dataIndex: 'styleNum', className: 'replacecolor' },
-        { title: '颜色', width: 210, dataIndex: 'color', className: 'replacecolor' },
+        { title: '颜色', width: 210, dataIndex: 'color', customRender: t => ellipsis(t), className: 'replacecolor' },
         // {
         //   title: '创建时间',
         //   dataIndex: 'createTime',
@@ -261,6 +269,7 @@ export default {
         }
       }
     },
+
     // father 抽屉方法
     aa() {}