面损列表 -详情-链接

src/views/cost-allocation-total/modal/detailFabricLossTable.vue

@@ -136,6 +136,16 @@
           :pagination="false"
           :rowClassName="setRowClassName"
         >
+        <!-- 采购数量 弹框-->
+        <span slot="purchaseQuantity" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
+
+          <!-- 余纱 -->
+          <span slot="surplusYarn" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
+
         
         </a-table>
       </div>
@@ -153,6 +163,20 @@
           :pagination="false" 
            :scroll="{ x: 1500 }"
           :loading="loading">
+          <!-- 材料出库数量 -->
+          <span slot="materialsOutQuantity" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
+
+          <!-- 采购入库数量 -->
+          <span slot="purchaseInQuantity" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
+           
+           <!-- 多发少发 -->
+           <span slot="iquantityMoreLess" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
           <!-- 附件 -->
           <span slot="enclosure" slot-scope="text, record"> 
              <a-button type="primary" @click="openItemOnclosure(record)" :disabled="record.buttonStatus">附件</a-button>
@@ -172,6 +196,20 @@
           bordered
           :pagination="false"
         >
+        <!-- 材料出库数量 -->
+        <span slot="materialsOutQuantity" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
+
+          <!-- 采购入库数量 -->
+          <span slot="purchaseInQuantity" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
+          
+          <!-- 多发少发 -->
+          <span slot="iquantityMoreLess" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
          <!-- 附件 -->
          <span slot="enclosure" slot-scope="text, record"> 
              <a-button type="primary" @click="openItemOnclosure(record)" :disabled="record.buttonStatus">附件</a-button>
@@ -190,6 +228,11 @@
           bordered
           :pagination="false"
         >
+         <!-- 成本金额 -->
+         <span slot="imoney" slot-scope="text,record">
+              <a v-if="(record.cbusType == '转出成本') || (record.cbusType == '转入成本')&& !record.bmanual" @click="imoneyCell(record)">{{text}}</a>
+              <span v-if="(record.cbusType !== '转出成本') && (record.cbusType !== '转入成本') && !record.bmanual" >{{text}}</span>
+          </span>
         </a-table>
       </div>
 
@@ -205,6 +248,11 @@
           bordered
           :pagination="false"
         >
+        <!-- 发票号码明细  -->
+        <span slot="invoiceNum" slot-scope="text">
+            <a v-if="text!=='合计'">{{ text }}</a>
+            <span v-else>{{text}}</span>
+          </span>
         </a-table>
       </div>
 
@@ -237,6 +285,10 @@
           bordered
           :pagination="false"
         >
+       <!-- 发票数量 -->
+       <span slot="ingredientsInvoiceQuantity" slot-scope="text, record">
+            <a v-if="record.caccount!=='合计'">{{ text }}</a>
+          </span>
         </a-table>
       </div>
 
@@ -321,6 +373,36 @@
       </a-row>
     </a-card>
   </div>
+  <!-- 采购数量弹框  @ok="modalFormOk"-->
+  <purchaseAmount-modal ref="purchaseAmountModal" :father="aa"></purchaseAmount-modal>
+
+<!-- 来源余纱 -->
+<surplusYarn-modal ref="surplusYarnModal" :father="bb"></surplusYarn-modal>
+
+<!-- 余纱 -->
+<purchaseLeft-modal ref="purchaseLeftModal"></purchaseLeft-modal>
+
+<!-- 其他入库的纱 -->
+<otherYarnsIn-modal ref="otherYarnsInModal" ></otherYarnsIn-modal>
+
+<!-- 多发少发 -->
+<iquantityMoreLess-modal ref="iquantityMoreLessModal"></iquantityMoreLess-modal>
+
+<!-- 委外订单国内弹框 -->
+<materialsOutQuantity-modal ref="materialsOutQuantityModal" :father="cc" @Bulk-price="bulkPrice"></materialsOutQuantity-modal>
+
+<!-- 采购入库数量弹框 -->
+<purchaseInQuantity-modal ref="purchaseInQuantityModal" :father="dd"></purchaseInQuantity-modal>
+
+<!-- 发票号码弹框 -->
+<invoiceNum-modal ref="invoiceNumModal" :father="ee"></invoiceNum-modal>
+
+<!-- 发票数量弹框 -->
+<invoiceQuantity-modal ref="invoiceQuantityModal" :father="ff"></invoiceQuantity-modal>
+
+<!-- 事故单 -->
+<accidentList-modal ref="accidentListModal" :father="gg"></accidentList-modal>
+<imoney-cell ref="imoneyCell"></imoney-cell>
    <!-- 附件 -->
    <attachment-display ref="attachmentDisplay"></attachment-display>
    <!-- 提交信息 -->
@@ -332,17 +414,17 @@
 </template>
 
 <script>
-// import PurchaseAmountModal from '@views/reportForms/fabric-loss-table/purchaseAmountModal.vue'
-// import materialsOutQuantityModal from '@views/reportForms/fabric-loss-table/materialsOutQuantityModal.vue'
-// import purchaseInQuantityModal from '@views/reportForms/fabric-loss-table/purchaseInQuantityModal.vue'
-// import invoiceNumModal from '@views/reportForms/fabric-loss-table/invoiceNumModal.vue'
-// import invoiceQuantityModal from '@views/reportForms/fabric-loss-table/invoiceQuantityModal.vue'
-// import accidentListModal from '@views/reportForms/fabric-loss-table/accidentListModal.vue'
-// import surplusYarnModal from '@views/reportForms/fabric-loss-table/surplusYarnModal.vue'
-// import purchaseLeftModal from '@views/reportForms/fabric-loss-table/purchaseLeftModal.vue'
-// import imoneyCell from '@views/reportForms/fabric-loss-table/imoneyCell.vue'
-// import iquantityMoreLessModal from '@views/reportForms/fabric-loss-table/iquantityMoreLessModal.vue'
-// import otherYarnsInModal from '@views/reportForms/fabric-loss-table/otherYarnsInModal.vue'
+import PurchaseAmountModal from '@views/reportForms/fabric-loss-table/purchaseAmountModal.vue'
+import materialsOutQuantityModal from '@views/reportForms/fabric-loss-table/materialsOutQuantityModal.vue'
+import purchaseInQuantityModal from '@views/reportForms/fabric-loss-table/purchaseInQuantityModal.vue'
+import invoiceNumModal from '@views/reportForms/fabric-loss-table/invoiceNumModal.vue'
+import invoiceQuantityModal from '@views/reportForms/fabric-loss-table/invoiceQuantityModal.vue'
+import accidentListModal from '@views/reportForms/fabric-loss-table/accidentListModal.vue'
+import surplusYarnModal from '@views/reportForms/fabric-loss-table/surplusYarnModal.vue'
+import purchaseLeftModal from '@views/reportForms/fabric-loss-table/purchaseLeftModal.vue'
+import imoneyCell from '@views/reportForms/fabric-loss-table/imoneyCell.vue'
+import iquantityMoreLessModal from '@views/reportForms/fabric-loss-table/iquantityMoreLessModal.vue'
+import otherYarnsInModal from '@views/reportForms/fabric-loss-table/otherYarnsInModal.vue'
 import AttachmentDisplay from '@views/reportForms/fabric-loss-table/attachment-display.vue'
 import submitInformation from '@views/cost-allocation-total/modal/submitInformation.vue'
 import SelectUserModal from '@views/cost-allocation-total/modal/SelectUserModal.vue'
@@ -360,16 +442,17 @@ export default {
   mixins: [JeecgListMixin],
   components: {
     // 面料损耗表 所有弹框
-    // PurchaseAmountModal,
-    // otherYarnsInModal,
-    // materialsOutQuantityModal,
-    // purchaseInQuantityModal,
-    // invoiceNumModal,
-    // invoiceQuantityModal,
-    // iquantityMoreLessModal,
-    // accidentListModal,
-    // surplusYarnModal,
-    // purchaseLeftModal,
+    PurchaseAmountModal,
+    otherYarnsInModal,
+    materialsOutQuantityModal,
+    purchaseInQuantityModal,
+    invoiceNumModal,
+    invoiceQuantityModal,
+    iquantityMoreLessModal,
+    accidentListModal,
+    surplusYarnModal,
+    purchaseLeftModal,
+    imoneyCell,
     JEllipsis,
     moment,
     JUpload,
@@ -440,6 +523,8 @@ export default {
           dataIndex: 'iquantityIn',
           width: '6%',
           className: 'replacecolor',
+          customCell: this.purchaseQuantityCustomCell,
+          scopedSlots: { customRender: 'purchaseQuantity' }
         },
 
         { title: '采购供应商', dataIndex: 'cvenAbbName', width: '7%', className: 'replacecolor' },
@@ -450,6 +535,8 @@ export default {
           dataIndex: 'iquantityLeft',
           width:'5%',
           className: 'replacecolor',
+          customCell: this.surplusYarnCustomCell,
+          scopedSlots: { customRender: 'surplusYarn' }
         },
         { title: '采购损耗', dataIndex: 'iquantityLeftRate', width: '6%', className: 'replacecolor' }
       ],
@@ -463,6 +550,8 @@ export default {
           dataIndex: 'iquantityOut',
           width: '5%',
           className: 'replacecolor',
+          customCell: this.materialsOutQuantityCustomCell,
+          scopedSlots: { customRender: 'materialsOutQuantity' }
         },
         { title: '计划数量', dataIndex: 'iquantity', width: '6%', className: 'replacecolor' },
 
@@ -497,7 +586,7 @@ export default {
         { title: '货物名称', dataIndex: 'cinvName', width: '20%',className: 'replacecolor specel-width' },
         { title: '颜色', dataIndex: 'ccolor', width: '7%', className: 'replacecolor' },
         { title: '损耗', dataIndex: 'cquantityLoss',  width: '6%',className: 'replacecolor' },
-         { title: '多发少发', dataIndex: 'iquantityMoreLess', width: '6%', className: 'replacecolor',},
+         { title: '多发少发', dataIndex: 'iquantityMoreLess', width: '6%', className: 'replacecolor', scopedSlots: { customRender: 'iquantityMoreLess' }, customCell: this.iquantityMoreLessCell,},
          { title: '附件', dataIndex: 'enclosure', width: '6%', className: 'noprint', scopedSlots: { customRender: 'enclosure' }}
       ],
 
@@ -506,7 +595,7 @@ export default {
         { title: '类型', width: 120, dataIndex: 'cvcname', className: 'replacecolor' },
         { title: '采购类型', width: 120, dataIndex: 'cbusType', className: 'replacecolor' },
         { title: '工厂', width: 120, dataIndex: 'cvenAbbName', className: 'replacecolor'},
-        { title: '成本金额', dataIndex: 'imoney', width: 120, className: 'replacecolor'},
+        { title: '成本金额', dataIndex: 'imoney', width: 120, className: 'replacecolor',scopedSlots: { customRender: 'imoney' }},
         { title: '无税金额', dataIndex: 'inoTaxMoney', width: 120, className: 'replacecolor' }
       ],
       costInvoiceData: [
@@ -554,6 +643,8 @@ export default {
 
           width: 120,
           className: 'replacecolor',
+          customCell: this.clInvoiceQuantityCustomCell,
+          scopedSlots: { customRender: 'clInvoiceQuantity' }
         }
       ],
       // 开票成本-成衣 表头
@@ -571,6 +662,8 @@ export default {
 
           width: 120,
           className: 'replacecolor',
+          customCell: this.clInvoiceQuantityCustomCell,
+          scopedSlots: { customRender: 'clInvoiceQuantity' }
         }
       ],
 
@@ -607,6 +700,8 @@ export default {
           width: '10%',
           dataIndex: 'iquantityInvoice',
           className: 'replacecolor',
+          customCell: this.ingredientsInvoiceQuantityCustomCell,
+          scopedSlots: { customRender: 'ingredientsInvoiceQuantity' }
         },
         { title: '开票金额(人民币)', width: '10%', dataIndex: 'isum', className: 'replacecolor' },
         { title: '开票金额(美元)', width: '10%', dataIndex: 'ioriSum', className: 'replacecolor',customRender: (text, record, index) => {
@@ -1071,6 +1166,127 @@ export default {
           }
         })
     },
+     // 【采购数量】单元格 弹框
+     purchaseQuantityCustomCell(record) {
+      return {
+        on: {
+          click: event => {
+
+            if (record.cpoid == '来源余料') {
+              this.$refs.surplusYarnModal.surplusYarnData = record.fabricPoOrderOutList;
+              this.$refs.surplusYarnModal.allDataList = record.fabricPoOrderOutList;
+              this.$refs.surplusYarnModal.surplusYarnModVis = true
+            }else if (record.cpoid == '其他入库') {
+              this.$refs.otherYarnsInModal.otherYarnsInData = record.fabricPoOrderOutList;
+              this.$refs.otherYarnsInModal.allDataList = record.fabricPoOrderOutList;
+              this.$refs.otherYarnsInModal.otherYarnsInModVis = true
+            } else {
+              this.$refs.purchaseAmountModal.purchaseAmountData = record.fabricPoOrderInList;              
+              this.$refs.purchaseAmountModal.allDataList = record.fabricPoOrderInList;
+              this.$refs.purchaseAmountModal.purchaseAmountModVis = true
+            }
+          }
+        }
+      }
+    },
+    // 余纱
+    surplusYarnCustomCell(record) {
+      return {
+        on: {
+          click: event => {
+            this.$refs.purchaseLeftModal.surplusYarnData = record.fabricPoOrderOutList;
+            this.$refs.purchaseLeftModal.allDataList = record.fabricPoOrderOutList;
+            this.$refs.purchaseLeftModal.surplusYarnModVis = true
+          }
+        }
+      }
+    },
+    // 【材料出库数量】 弹框
+    materialsOutQuantityCustomCell(record) {
+      return {
+        on: {
+          click: event => {
+            this.$refs.materialsOutQuantityModal.materialsOutQuantityData = record.fabricMoOrderCKList;
+            this.$refs.materialsOutQuantityModal.allDataList = record.fabricMoOrderCKList;
+            this.$refs.materialsOutQuantityModal.queryParam = {};
+            this.$refs.materialsOutQuantityModal.materialsOutQuantityModVis = true
+            this.$refs.materialsOutQuantityModal.type = '1'
+          }
+        }
+      }
+    },
+     // 采购入库数量
+     purchaseInQuantityCustomCell(record) {
+      return {
+        on: {
+          click: event => {
+            this.$refs.purchaseInQuantityModal.purchaseInQuantityData = record.fabricMoOrderRKList;
+            this.$refs.purchaseInQuantityModal.allDataList = record.fabricMoOrderRKList;
+            this.$refs.purchaseInQuantityModal.queryParam = {};
+            this.$refs.purchaseInQuantityModal.purchaseInQuantityModVis = true
+          }
+        }
+      }
+    },
+    iquantityMoreLessCell(record){
+      return {
+        on: {
+          click: event => {
+            this.$refs.iquantityMoreLessModal.surplusYarnData = record.fabricPoOrderOutList;
+            this.$refs.iquantityMoreLessModal.allDataList = record.fabricPoOrderOutList;
+            this.$refs.iquantityMoreLessModal.surplusYarnModVis = true
+          }
+        }
+      }
+    },
+    // 开票成本-面料弹框
+    invoiceNumCustomCell(record) {
+      if(record.csbvcode!=='合计'){
+        return {
+        on: {
+          click: event => {
+            this.$refs.invoiceNumModal.invoiceNumData = record.fabricCostClothDetailList;
+            this.$refs.invoiceNumModal.allDataList = record.fabricCostClothDetailList;
+            this.$refs.invoiceNumModal.queryParam = {};
+            this.$refs.invoiceNumModal.invoiceNumModVis = true;
+          }
+        }
+      }
+      }
+    },
+    // 开票成本成衣-弹框
+    clInvoiceQuantityCustomCell(record) {
+      return {
+        on: {
+          click: event => {
+            this.$refs.invoiceQuantityModal.invoiceQuantityData = record.fabricCostClothesDetailList;
+            this.$refs.invoiceQuantityModal.allDataList = record.fabricCostClothesDetailList;
+            this.$refs.invoiceQuantityModal.invoiceQuantityModVis = true;
+          }
+        }
+      }
+    },
+    // 开票成本辅料-弹框
+    ingredientsInvoiceQuantityCustomCell(record) {
+      if(record.caccount!=='合计'){
+        return {
+        on: {
+          click: event => {
+            this.$refs.invoiceQuantityModal.invoiceQuantityData = record.fabricCostAssistDetailList;
+            this.$refs.invoiceQuantityModal.allDataList = record.fabricCostAssistDetailList;
+            this.$refs.invoiceQuantityModal.queryParam = {};
+            this.$refs.invoiceQuantityModal.invoiceQuantityModVis = true
+          }
+        }
+      }
+      }
+    },
+    //成本金额弹窗
+    imoneyCell(record){
+            this.$refs.imoneyCell.imoneyModVis = true
+            this.$refs.imoneyCell.imoneyData = record.costInvoiceDetailList
+           
+    },
 
   
     // father
@@ -1093,6 +1309,10 @@ export default {
   height: 571px;
     overflow-y: scroll;
 }
+/deep/ .ant-table.ant-table-bordered .ant-table-footer {
+  border: none;
+  padding: 0;
+}
 
 
 </style>

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

@@ -155,6 +155,7 @@ export default {
   text-align: center;
 }
 
+
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }

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

@@ -100,7 +100,7 @@ export default {
         },
       ],
       imoneyData:[],
-      imoneyModVis:false
+      imoneyModVis:false,
     }
   },
   // 接收父组件 方法
@@ -136,6 +136,10 @@ export default {
  /deep/ .ant-table-footer .ant-table-body {
     overflow: hidden !important;
   }
+  /deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }

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

@@ -240,6 +240,10 @@ export default {
 /deep/ .ant-table-tbody {
   text-align: center;
 }
+/deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 
 // /deep/ th.replacecolor {
 //   background-color: #ccc;

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

@@ -210,6 +210,10 @@ export default {
 /deep/ .ant-table-tbody {
   text-align: center;
 }
+/deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 
 // /deep/ th.replacecolor {
 //   background-color: #ccc;

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

@@ -288,4 +288,8 @@ export default {
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }
+/deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 </style>

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

@@ -70,7 +70,7 @@
               </span>
             </a-col>
           </a-row>
-          <a-row :gutter="24">
+          <a-row :gutter="24" v-if="type!=='1'">
             <a-col :md="4" :sm="8">
               <a-form-item label="">
                  <a-input placeholder="请输入" v-model="editPricre"></a-input>
@@ -101,7 +101,8 @@
           :footer="showTotal"
         >
         <template slot="iprice" slot-scope="text, record, index">
-              <a-input placeholder="请输入物料名称" v-model="record.iprice"  @blur="changePrice(record)" @pressEnter="changePrice(record)"></a-input>
+              <a-input placeholder="请输入物料名称" v-model="record.iprice"  @blur="changePrice(record)" @pressEnter="changePrice(record)" v-if="type!=='1'"></a-input>
+              <span v-else>{{ record.iprice }}</span>
         </template>
         </a-table>
 
@@ -224,7 +225,7 @@ export default {
       // orderDataform: this.$form.createForm(this),
       confirmLoading: false,
       materialsOutQuantityModVis: false,
-
+     type:'',
       // 查询条件
       queryParam: {
         cbatchOut: '', // 批号
@@ -353,6 +354,7 @@ export default {
       this.$emit('close')
       this.materialsOutQuantityModVis = false
       this.allowModification = 'no'
+      this.type =''
     },
     showTotal(data) {
       return (
@@ -402,7 +404,10 @@ export default {
  /deep/ .ant-table-footer .ant-table-body {
     overflow: hidden !important;
   }
-
+  /deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }

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

@@ -303,6 +303,10 @@ export default {
 /deep/ .ant-table-footer .ant-table-body {
     overflow: hidden !important;
   }
+  /deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 
 // /deep/ th.replacecolor {
 //   background-color: #ccc;

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

@@ -333,7 +333,10 @@ export default {
  /deep/ .ant-table-footer .ant-table-body {
     overflow: hidden !important;
   }
-
+  /deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }

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

@@ -304,6 +304,10 @@ export default {
  /deep/ .ant-table-footer .ant-table-body {
     overflow: hidden !important;
   }
+  /deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 
 // /deep/ th.replacecolor {
 //   background-color: #ccc;

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

@@ -284,6 +284,10 @@ export default {
  /deep/ .ant-table-footer .ant-table-body {
     overflow: hidden !important;
   }
+  /deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }

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

@@ -305,6 +305,10 @@ export default {
  /deep/ .ant-table-footer .ant-table-body {
     overflow: hidden !important;
   }
+  /deep/.ant-modal-body{
+  height: auto !important;
+    overflow-y: scroll;
+}
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }