修改bug

src/combination/listComponent.vue

@@ -2,125 +2,78 @@
   <div>
     <div style="width: 100%;height: 40px;">
       <div style="margin: 10px 12px;float: left;">
-        <span v-for="(item,index) in customButton" :key="index">
-          <el-upload
-            v-if="item.upload === true"
-            style="float: left;margin-right: 10px"
-            class="upload-demo"
-            :headers="headers"
-            :action="item.action"
-            :show-file-list="false"
-            :on-success="handleAvatarSuccess"
+        <span v-for="(item, index) in customButton" :key="index">
+          <el-upload v-if="item.upload === true" style="float: left;margin-right: 10px" class="upload-demo"
+            :headers="headers" :action="item.action" :show-file-list="false" :on-success="handleAvatarSuccess"
             :multiple="false">
-             <el-button :size="item.size" :icon="item.icon" :type="item.type" :disabled="item.disabled" :plain="item.plain?item.plain:false" v-hasPermi="item.hasPermi?item.hasPermi:hasPermi.lookup">点击上传</el-button>
+            <el-button :size="item.size" :icon="item.icon" :type="item.type" :disabled="item.disabled"
+              :plain="item.plain ? item.plain : false" v-hasPermi="item.hasPermi ? item.hasPermi : hasPermi.lookup">点击上传
+            </el-button>
           </el-upload>
-        <el-button
-          v-else
-          style="float: left;margin-right: 10px"
-          :type="item.type"
-          :size="item.size"
-          :icon="item.icon"
-          :plain="item.plain?item.plain:false"
-          :disabled="item.disabled"
-          v-hasPermi="item.hasPermi?item.hasPermi:hasPermi.lookup"
-          @click="buttonList(item)">
-          {{ item.name }}
-        </el-button>
+          <el-button v-else style="float: left;margin-right: 10px" :type="item.type" :size="item.size" :icon="item.icon"
+            :plain="item.plain ? item.plain : false" :disabled="item.disabled"
+            v-hasPermi="item.hasPermi ? item.hasPermi : hasPermi.lookup" @click="buttonList(item)">
+            {{ item.name }}
+          </el-button>
         </span>
       </div>
       <div class="tabSetting" style="float: right;margin: 10px 0">
         <div style="margin-left:10px;float: right">
-          <el-button
-            icon="el-icon-setting"
-            size="mini"
-            circle
-            @click="showSetting = !showSetting"
-          ></el-button>
+          <el-button icon="el-icon-setting" size="mini" circle @click="showSetting = !showSetting"></el-button>
         </div>
-        <right-toolbar
-          v-if="isItHidden"
-          @showSearch="showSearch"
-          @queryTable="getList"
-        ></right-toolbar>
+        <right-toolbar v-if="isItHidden" @showSearch="showSearch" @queryTable="getList"></right-toolbar>
       </div>
       <div style="margin:10px 10px 0 0;float: right;" v-if="isItHidden">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-search"
-          size="mini"
-          @click="feedback('搜索')"
-        >搜索</el-button>
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-refresh-left"
-          @click="feedback('重置')"
-          size="mini"
-        >重置</el-button>
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-open"
-          @click="feedback('展开')"
-          size="mini"
-        >展开</el-button>
+        <el-button type="success" plain icon="el-icon-search" size="mini" @click="feedback('搜索')">搜索</el-button>
+        <el-button type="warning" plain icon="el-icon-refresh-left" @click="feedback('重置')" size="mini">重置</el-button>
+        <el-button type="info" plain icon="el-icon-open" @click="feedback('展开')" size="mini">展开</el-button>
       </div>
     </div>
-    <el-table
-      :data="tableData"
-      style="width: 100%"
-      @selection-change="handleSelectionChange"
-      :row-class-name="rowClassName"
-      :show-summary="tatolLabel?true:false"
-      :summary-method="listTotal"
-    >
-      <el-table-column type="selection" width="60" align="center" fixed="left"/>
-      <el-table-column
-        v-for="(item,index) in queryList.columnList"
-        :key="index"
-        :prop="item.label"
-        :label="item.name"
-        :width="item.width"
-        :fixed="item.fixed"
-        :show-overflow-tooltip="item.changeable?false:true"
-        align="center"
-        sortable
-      >
+    <el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange"
+      :row-class-name="rowClassName" :show-summary="tatolLabel ? true : false" :summary-method="listTotal"
+      @expand-change="expandChange" class="apTable">
+      <el-table-column type="expand" v-if="expandBool">
+        <template slot-scope="props">
+          <el-table :data="props.row.itemData" style="width: 100%">
+            <el-table-column v-for="(item, index) in itemdetailStyle" :key="index" :prop="item.label"
+              :label="item.name" :width="item.width" :fixed="item.fixed"></el-table-column>
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column type="selection" width="60" align="center" fixed="left" />
+      <el-table-column v-for="(item, index) in queryList.columnList" :key="index" :prop="item.label" :label="item.name"
+        :width="item.width" :fixed="item.fixed" :show-overflow-tooltip="item.changeable ? false : true" align="center"
+        sortable>
         <template slot-scope="scope">
-<!--          <span style="display:none;">{{item.disabled}}</span>-->
+          <!--          <span style="display:none;">{{item.disabled}}</span>-->
           <span v-if="item.name === '操作'">
             <span v-if="item.operation == 1">
               <el-button type="text" @click="viewMethod(scope)" v-hasPermi="hasPermi.lookup">查看</el-button>
-<!--              <el-button type="text" @click="modification(scope)">修改</el-button>-->
-              <el-button type="text" @click="deletion(scope)" v-if="scope.row.fBillstatus < 4 || !scope.row.fBillstatus" v-hasPermi="hasPermi.disappear">删除</el-button>
+              <!--              <el-button type="text" @click="modification(scope)">修改</el-button>-->
+              <el-button type="text" @click="deletion(scope)" v-if="scope.row.fBillstatus < 4 || !scope.row.fBillstatus"
+                v-hasPermi="hasPermi.disappear">删除</el-button>
             </span>
             <span v-if="item.operation == 2">
-              <el-button type="text" @click="deleteRow(scope.$index, tableData)" :disabled="item.disabled">移除</el-button>
+              <el-button type="text" @click="deleteRow(scope.$index, tableData)" :disabled="item.disabled">移除
+              </el-button>
             </span>
           </span>
           <span v-else-if="item.changeable && listData">
-            <el-select v-if="item.changeable == 1" filterable :disabled="item.disabled" @change="change(scope)" v-model="scope.row[item.label]" slot="prepend" placeholder="请选择">
-              <el-option
-                v-for="(item,index) in listData[item.label]"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
+            <el-select v-if="item.changeable == 1" filterable :disabled="item.disabled" @change="change(scope)"
+              v-model="scope.row[item.label]" slot="prepend" placeholder="请选择">
+              <el-option v-for="(item, index) in listData[item.label]" :key="index" :label="item.label"
+                :value="item.value"></el-option>
             </el-select>
-            <el-input v-if="item.changeable == 2" @input="totalAmount(scope,item)" :disabled="item.disabled" v-model="scope.row[item.label]" placeholder="请输入内容" :onkeyup="item.onabort"></el-input>
-            <el-date-picker
-              v-if="item.changeable == 3"
-              v-model="scope.row[item.label]"
-              type="date"
-              :disabled="item.disabled"
-              style="width: 100%"
-              placeholder="选择日期"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"
-            >
+            <el-input v-if="item.changeable == 2" @input="totalAmount(scope, item)" :disabled="item.disabled"
+              v-model="scope.row[item.label]" placeholder="请输入内容" :onkeyup="item.onabort"></el-input>
+            <el-date-picker v-if="item.changeable == 3" v-model="scope.row[item.label]" type="date"
+              :disabled="item.disabled" style="width: 100%" placeholder="选择日期" format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd">
             </el-date-picker>
           </span>
+          <!-- <span v-else-if="item.label == 'projectName' && CRKTJ" 
+            style="color: #409EFF;cursor: pointer"
+            @click.stop="jump(scope.row)">{{ scope.row[item.label] }}</span> -->
           <span v-else>{{ scope.row[item.label] }}</span>
         </template>
       </el-table-column>
@@ -128,45 +81,22 @@
     <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px">
       <div>配置排序列数据（拖动调整顺序）</div>
       <div style="margin-left: 17px">
-        <el-checkbox
-          v-model="allCheck"
-          label="全选"
-          @change="allChecked"
-        ></el-checkbox>
+        <el-checkbox v-model="allCheck" label="全选" @change="allChecked"></el-checkbox>
       </div>
       <div style="padding: 4px; display: flex; justify-content: center">
-        <draggable
-          v-model="setRowList"
-          group="site"
-          animation="300"
-          @start="onStart"
-          @end="onEnd"
-          handle=".indraggable"
-        >
+        <draggable v-model="setRowList" group="site" animation="300" @start="onStart" @end="onEnd"
+          handle=".indraggable">
           <transition-group>
-            <div
-              v-for="item in setRowList"
-              :key="item.surface"
-              class="listStyle"
-            >
+            <div v-for="item in setRowList" :key="item.surface" class="listStyle">
               <div style="width: 500px" class="indraggable">
                 <div class="progress" :style="{ width: item.width + 'px' }">
-                  <el-checkbox
-                    :label="item.name"
-                    v-model="item.checked"
-                    :true-label="0"
-                    :false-label="1"
-                  >{{ item.name }}
+                  <el-checkbox :label="item.name" v-model="item.checked" :true-label="0" :false-label="1">{{ item.name
+                  }}
                   </el-checkbox>
                 </div>
               </div>
-              <el-input-number
-                v-model.number="item.width"
-                controls-position="right"
-                :min="1"
-                :max="500"
-                size="mini"
-              ></el-input-number>
+              <el-input-number v-model.number="item.width" controls-position="right" :min="1" :max="500" size="mini">
+              </el-input-number>
             </div>
           </transition-group>
         </draggable>
@@ -186,7 +116,7 @@ import Cookies from "js-cookie";
 import { getToken } from '@/utils/auth'
 export default {
   name: 'listComponent',
-  props: ['tableData', 'listStyle','queryList','customButton','arrow','setRowList','isItHidden','tatolLabel','listData','hasPermi'],
+  props: ['tableData', 'listStyle', 'queryList', 'customButton', 'arrow', 'setRowList', 'isItHidden', 'tatolLabel', 'listData', 'hasPermi', 'CRKTJ','expandBool','itemdetailStyle'],
   data() {
     return {
       showSetting: false,
@@ -196,9 +126,9 @@ export default {
       },
     }
   },
-  watch:{
-    queryList: function (newValue,oldValue) {
-      console.log(newValue,oldValue)
+  watch: {
+    queryList: function (newValue, oldValue) {
+      console.log(newValue, oldValue)
       this.queryList.columnList = newValue.columnList
     },
   },
@@ -209,18 +139,18 @@ export default {
   },
   methods: {
     //下拉数据变动时触发
-    change(scope){
-      this.$emit('change',scope)
+    change(scope) {
+      this.$emit('change', scope)
     },
     //输入框数据变动时触发
-    totalAmount(scope,item){
-      this.$emit('totalAmount',scope,item)
+    totalAmount(scope, item) {
+      this.$emit('totalAmount', scope, item)
     },
     //合计
     listTotal(param) {
       const { columns, data } = param
       const sums = []
-      for(let item in this.tatolLabel){
+      for (let item in this.tatolLabel) {
         columns.forEach((column, index) => {
           if (index === 0) {
             sums[index] = '合计'
@@ -242,15 +172,15 @@ export default {
       }
       return sums
     },
-    initData(){
+    initData() {
       this.queryList.columnList = this.queryList.columnList
       console.log(this.queryList.columnList)
     },
     //行号设置
-    rowClassName({row, rowIndex}) {
+    rowClassName({ row, rowIndex }) {
       // console.log(row,rowIndex)
       //把每一行的索引放进row.id
-      row.serialNumber = rowIndex+1;
+      row.serialNumber = rowIndex + 1;
       // console.log(row.fLineNumber)
     },
     //列设置全选
@@ -297,32 +227,32 @@ export default {
       resetModule(this.data).then((res) => {
         if (res.code == 200) {
           this.showSetting = false;
-          this.$set(this.queryList,'columnList',this.listStyle)
+          this.$set(this.queryList, 'columnList', this.listStyle)
           this.setRowList = this.listStyle;
         }
       });
     },
-    showSearch(){
+    showSearch() {
       this.$emit('showSearch')
     },
-    handleAvatarSuccess(response, file, fileList){
+    handleAvatarSuccess(response, file, fileList) {
       console.log()
-      if (response.code == 200){
+      if (response.code == 200) {
         this.$emit('handleAvatarSuccess')
-      }else {
+      } else {
         this.$message.error(response.msg);
       }
     },
     //刷新按钮
-    getList(){
+    getList() {
       this.$emit('getList')
     },
     //搜索、重置、展开
-    feedback(res){
-      this.$emit('feedback',res)
+    feedback(res) {
+      this.$emit('feedback', res)
     },
     //所有按钮
-    buttonList(row){
+    buttonList(row) {
       this.$emit('buttonList', row)
     },
     //查看
@@ -330,24 +260,31 @@ export default {
       this.$emit('see', scope)
     },
     //修改
-    modification(scope){
+    modification(scope) {
       this.$emit('modify', scope)
     },
     //删除
-    deletion(scope){
+    deletion(scope) {
       this.$emit('deletion', scope)
     },
     //移出
     deleteRow(index, rows) {
-      this.$emit('deletRows',index,rows)
+      this.$emit('deletRows', index, rows)
     },
     //选择
-    handleSelectionChange(selection){
+    handleSelectionChange(selection) {
       this.$emit('selectionbox', selection)
     },
-    handleClick(){
+    handleClick() {
       this.$emit('handleClick')
     },
+    jump(row) {
+      this.$emit('jump', row)
+      // console.log(row)
+    },
+    expandChange(row) {
+      this.$emit('expandChange', row)
+    }
   },
 }
 </script>
@@ -359,9 +296,11 @@ export default {
   border-left: 1px solid #dcdfe6;
   border-right: 1px solid #dcdfe6;
 }
+
 .listStyle:last-child {
   border-bottom: 1px solid #dcdfe6;
 }
+
 .progress {
   display: flex;
   align-items: center;
@@ -369,4 +308,7 @@ export default {
   background-color: rgba(0, 0, 0, 0.05);
   height: 100%;
 }
+.apTable /deep/ .el-table__expanded-cell[class*=cell] {
+    padding: 0px 60px;
+}
 </style>

src/views/reportAnalysis/inoutStatistics.vue

@@ -16,6 +16,7 @@
       @showSearch="showSearch"
       @feedback="feedback"
       @getList="getList"
+      @jump="jump"
       :hasPermi="hasPermi"
       :tatolLabel="tatolLabel"
       :isItHidden="isItHidden"
@@ -23,6 +24,7 @@
       :listStyle="listStyle"
       :queryList="queryList"
       :setRowList="setRowList"
+      :CRKTJ="true"
     />
     <!--    <el-pagination-->
     <!--      style="float: right;margin-top: 10px"-->
@@ -508,6 +510,10 @@ export default {
     handleCurrentChange(val) {
       this.formDataList.pageNum = val
       this.query(this.formDataList)
+    },
+    jump(row){
+      console.log(row)
+      
     }
   }
 }

src/views/warehouse/inStock/index.vue

@@ -1,361 +1,142 @@
 <template>
   <div class="app-container">
     <div v-if="MainTable == false">
-      <MainForm
-        ref="MainForm"
-        :searchdata="formOption"
-        :display="display"
-        :form="queryParms"
-        :show="show"
-        :inDex="inDex"
-      />
-      <listComponent
-        style="clear: both"
-        v-if="waitFor"
-        :tableData="tableData"
-        @selectionbox="selectionbox"
-        @see="viewMethod"
-        @modify="modification"
-        @deletion="deletion"
-        @buttonList="buttonList"
-        @showSearch="showSearch"
-        @getList="getList"
-        @feedback="feedback"
-        :customButton="customButton"
-        :arrow="arrow"
-        :hasPermi="hasPermi"
-        :tatolLabel="mainTatol"
-        :seachButton="seachButton"
-        :setRowList="setRowList"
-        :listStyle="listStyle"
-        :isItHidden="isItHidden"
-        :queryList="queryList"
-      />
+      <MainForm ref="MainForm" :searchdata="formOption" :display="display" :form="queryParms" :show="show"
+        :inDex="inDex" />
+      <listComponent style="clear: both" v-if="waitFor" :tableData="tableData" @selectionbox="selectionbox"
+        @see="viewMethod" @modify="modification" @deletion="deletion" @buttonList="buttonList" @showSearch="showSearch"
+        @getList="getList" @feedback="feedback" @expandChange="expandChange" :customButton="customButton" :arrow="arrow"
+        :hasPermi="hasPermi" :tatolLabel="mainTatol" :seachButton="seachButton" :setRowList="setRowList"
+        :listStyle="listStyle" :isItHidden="isItHidden" :queryList="queryList" :expandBool="true" :itemdetailStyle="itemdetailStyle" />
       <div style="float: right; margin-bottom: 10px">
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParms.pageNum"
-          :limit.sync="queryParms.pageSize"
-          @pagination="getList"
-          :page-sizes="[10, 100, 200, 500, 1000]"
-        />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParms.pageNum" :limit.sync="queryParms.pageSize"
+          @pagination="getList" :page-sizes="[10, 100, 200, 500, 1000]" />
       </div>
     </div>
     <div v-if="MainTable == true">
-      <el-breadcrumb
-        separator="/"
-        style="display: flex; align-items: center; margin-bottom: 10px"
-      >
+      <el-breadcrumb separator="/" style="display: flex; align-items: center; margin-bottom: 10px">
         <el-breadcrumb-item>
-          <el-button
-            plain
-            size="mini"
-            type="danger"
-            icon="el-icon-arrow-left"
-            @click="backRules"
-          >
+          <el-button plain size="mini" type="danger" icon="el-icon-arrow-left" @click="backRules">
             返回列表
           </el-button>
         </el-breadcrumb-item>
       </el-breadcrumb>
       <h1 style="text-align: center; margin-top: -42px">仓库入库</h1>
-      <MainForm
-        ref="detailForm"
-        :searchdata="detailOption"
-        :display="display"
-        :form="detailForm"
-        :show="(show = true)"
-        :inDex="inDex"
-        @backRules="backRules"
-        @backSave="backSave"
-        @verificationRules="verificationRules"
-        @changeWarehouse="changeWarehouse"
-      />
-      <list-component
-        v-if="waitFor"
-        :tableData="detailData"
-        @selectionbox="selectionbox"
-        @see="viewMethod"
-        @modify="modification"
-        @deletion="deletion"
-        @buttonList="buttonList"
-        @showSearch="showSearch"
-        @getList="getList"
-        @deletRows="deletRows"
-        @feedback="feedback"
-        @totalAmount="totalAmount"
-        @change="change"
-        :seachButton="confirmButton"
-        :customButton="detailButton"
-        :listStyle="detailStyle"
-        :hasPermi="hasPermi"
-        :setRowList="setRowList"
-        :tatolLabel="tatolLabel"
-        :listData="listData"
-        :queryList="detailList"
-      />
+      <MainForm ref="detailForm" :searchdata="detailOption" :display="display" :form="detailForm" :show="(show = true)"
+        :inDex="inDex" @backRules="backRules" @backSave="backSave" @verificationRules="verificationRules"
+        @changeWarehouse="changeWarehouse" />
+      <list-component v-if="waitFor" :tableData="detailData" @selectionbox="selectionbox" @see="viewMethod"
+        @modify="modification" @deletion="deletion" @buttonList="buttonList" @showSearch="showSearch" @getList="getList"
+        @deletRows="deletRows" @feedback="feedback" @totalAmount="totalAmount" @change="change"
+        :seachButton="confirmButton" :customButton="detailButton" :listStyle="detailStyle" :hasPermi="hasPermi"
+        :setRowList="setRowList" :tatolLabel="tatolLabel" :listData="listData" :queryList="detailList" />
     </div>
-    <el-dialog
-      title="打印入库"
-      :visible.sync="dialogVisible"
-      :fullscreen="true"
-      style="padding: 0; margin: 0"
-      width="70%"
-    >
+    <el-dialog title="打印入库" :visible.sync="dialogVisible" :fullscreen="true" style="padding: 0; margin: 0" width="70%">
       <div ref="print">
-        <table
-          class="table table-striped table-bordered"
-          align="center"
-          valign="center"
-          style="
+        <table class="table table-striped table-bordered" align="center" valign="center" style="
             font-size: 12px;
             border-collapse: collapse;
             border: none;
             margin-top: 10px;
-          "
-        >
+          ">
           <tr>
-            <td
-              style="font-size: 24px; font-weight: bold"
-              class="column"
-              colspan="15"
-              align="center"
-            >
+            <td style="font-size: 24px; font-weight: bold" class="column" colspan="15" align="center">
               入库明细
             </td>
           </tr>
 
           <tr>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-              rowspan="2"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center" rowspan="2">
               入库时间
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-              rowspan="2"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center" rowspan="2">
               产品名称
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-              rowspan="2"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center" rowspan="2">
               规格
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-              rowspan="2"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center" rowspan="2">
               数量
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-              rowspan="2"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center" rowspan="2">
               供货商
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-              rowspan="2"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center" rowspan="2">
               供货人
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-              rowspan="2"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center" rowspan="2">
               联系电话
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-              rowspan="2"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center" rowspan="2">
               生产日期或批号
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-              rowspan="2"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center" rowspan="2">
               保质期限
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-              rowspan="2"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center" rowspan="2">
               保存条件
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-              rowspan="2"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center" rowspan="2">
               索证索票情况
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-              rowspan="2"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center" rowspan="2">
               采购人
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-              colspan="2"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center" colspan="2">
               检验结果
             </td>
 
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-              rowspan="2"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center" rowspan="2">
               验收人
             </td>
           </tr>
           <tr>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center">
               感官
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center">
               数量
             </td>
           </tr>
           <tr v-for="(item, index) in this.detailData" :key="index">
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center">
               {{ detailForm.fBsdate }}
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center">
               {{ item.feeName }}
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center">
               {{ item.fFeeunitid }}
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center">
               {{ item.fQty }}
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center">
               {{ detailForm.corpName }}
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center">
               {{ item.fAmount }}
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-            ></td>
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center"></td>
             <!--            <td class="column" style="border: 1px solid #000; padding:10px" align="center">{{ item.fStltypeid }}</td>-->
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center">
               {{ item.tProductdate }}/{{ item.fLotno }}
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center">
               {{ item.fValid }}{{ item.fUnitsName }}
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center">
               {{ item.fStoreEnvName }}
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center">
               {{ item.fIsfillesName }}
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-            >
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center">
               {{ detailForm.fpurchaseName }}
             </td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-            ></td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-            ></td>
-            <td
-              class="column"
-              style="border: 1px solid #000; padding: 10px"
-              align="center"
-            ></td>
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center"></td>
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center"></td>
+            <td class="column" style="border: 1px solid #000; padding: 10px" align="center"></td>
           </tr>
         </table>
       </div>
@@ -445,6 +226,7 @@ export default {
         pageSize: 10,
         fBilltype: "RK",
       },
+      itemData: [],
       detailForm: {},
       setRowList: [],
       //主页面默认显示4个表单数据
@@ -865,6 +647,160 @@ export default {
           disabled: false,
         },
       ],
+      //从表数据
+      itemdetailStyle: [
+        {
+          surface: "2",
+          label: "feeName",
+          name: "品名",
+          checked: 0,
+          width: 200,
+          changeable: 1,
+          data: [],
+          disabled: false,
+        },
+        {
+          surface: "3",
+          label: "fCurrencyName",
+          name: "规格",
+          checked: 0,
+          width: 100,
+          disabled: false,
+        },
+        {
+          surface: "4",
+          label: "fUnitprice",
+          name: "单价",
+          checked: 0,
+          width: 100,
+          operation: 2,
+          changeable: 2,
+          disabled: false,
+          onabort: "this.value=this.value.replace(/[^\\d^\\.]+/g,'')",
+        },
+        {
+          surface: "5",
+          label: "fQty",
+          name: "数量",
+          checked: 0,
+          width: 100,
+          operation: 2,
+          changeable: 2,
+          disabled: false,
+          onabort: "this.value=this.value.replace(/[^\\d^\\.]+/g,'')",
+        },
+        {
+          surface: "6",
+          label: "fFeeunitid",
+          name: "计量单位",
+          checked: 0,
+          width: 100,
+          changeable: 1,
+          operation: 2,
+          data: [],
+          disabled: false,
+        },
+        {
+          surface: "7",
+          label: "fWarehouseName",
+          name: "库区",
+          checked: 0,
+          width: 100,
+          operation: 2,
+          changeable: 1,
+          data: [],
+          disabled: false,
+        },
+        {
+          surface: "8",
+          label: "fAmount",
+          name: "金额",
+          checked: 0,
+          width: 100,
+          operation: 2,
+          changeable: 2,
+          disabled: false,
+          onabort:
+            'this.value=this.value.replace(/[^\\-?\\d.]/g,"").replace(/^(\\-)*(\\d+)\\.(\\d\\d).*$/, "$1$2.$3")',
+        },
+        {
+          surface: "9",
+          label: "fStltypeid",
+          name: "付费方式",
+          checked: 0,
+          width: 100,
+          operation: 2,
+          changeable: 1,
+          data: [],
+          disabled: false,
+        },
+        {
+          surface: "10",
+          label: "tProductdate",
+          name: "生产日期",
+          checked: 0,
+          width: 100,
+          operation: 2,
+          changeable: 3,
+          data: [],
+          disabled: false,
+        },
+        {
+          surface: "11",
+          label: "fLotno",
+          name: "批号",
+          checked: 0,
+          width: 100,
+          operation: 2,
+          changeable: 2,
+          data: [],
+          disabled: false,
+        },
+        {
+          surface: "12",
+          label: "fValid",
+          name: "保质期限",
+          checked: 0,
+          width: 100,
+          operation: 2,
+          changeable: 2,
+          data: [],
+          disabled: false,
+          onabort: "this.value=this.value.replace(/[^\\d^\\.]+/g,'')",
+        },
+        {
+          surface: "13",
+          label: "fUnits",
+          name: "单位",
+          checked: 0,
+          width: 100,
+          operation: 2,
+          changeable: 1,
+          data: [],
+          disabled: false,
+        },
+        {
+          surface: "14",
+          label: "fStoreEnv",
+          name: "存储环境",
+          checked: 0,
+          width: 100,
+          operation: 2,
+          changeable: 1,
+          data: [],
+          disabled: false,
+        },
+        {
+          surface: "15",
+          label: "fIsfilles",
+          name: "索证索票",
+          checked: 0,
+          width: 100,
+          operation: 2,
+          changeable: 1,
+          disabled: false,
+        }
+      ],
       //详情主表
       detailOption: [
         {
@@ -1180,7 +1116,7 @@ export default {
   },
   methods: {
     //返回列表
-    goBack() {},
+    goBack() { },
     change(scope) {
       for (let item in this.detailData) {
         for (let li in this.listData.fFeeid) {
@@ -1228,6 +1164,17 @@ export default {
         });
       }
     },
+    expandChange(row) {
+      if (!row.itemData.length) {
+        getSave(row.fId).then((res) => {
+          this.tableData.forEach(e => {
+            if (e.fId == row.fId) {
+              e.itemData = res.data.tWarehousebillsfees
+            }
+          })
+        });
+      }
+    },
     //自动合计金额
     totalAmount(scope, item) {
       if (item.label === "fAmount") {
@@ -1746,7 +1693,7 @@ export default {
       }
     },
     //修改
-    modification(scope) {},
+    modification(scope) { },
     //删除
     deletion(scope) {
       const fIds = scope.row.fId || this.ids;
@@ -2360,8 +2307,8 @@ export default {
             cancelButtonText: "取消",
             type: "warning",
           }).then(function () {
-              return getExport(dataForm);
-            })
+            return getExport(dataForm);
+          })
             .then((response) => {
               this.download(response.msg);
             });
@@ -2395,6 +2342,9 @@ export default {
     getList(res) {
       this.queryParms.fBilltype = "RK";
       listInStock(this.queryParms).then((response) => {
+        response.rows.forEach(e => {
+          e.itemData = []
+        })
         this.tableData = response.rows;
         this.total = response.total;
         if (res == 1) {
@@ -2411,6 +2361,7 @@ export default {
 .app-container ::v-deep .el-form-item {
   margin-bottom: 4px;
 }
+
 .table {
   border-collapse: collapse;
   border-spacing: 0;
@@ -2432,6 +2383,7 @@ export default {
 .column {
   border: 1px solid #000;
 }
+
 .app-container ::v-deep .el-table__body-wrapper {
   z-index: 2;
 }