修改样式

src/components/Materialman/rukuDetails.vue

@@ -71,11 +71,11 @@
         <th>数量</th>
         </thead>
         <tbody>
-        <tr  v-for="(item,index) in GetDetail.DetailList" :key="index">
+        <tr :class="index!=0?'trNobottom':''" v-for="(item,index) in GetDetail.DetailList" :key="index">
           <td><span @click="getCheckDes(item)" style="text-decoration: underline;cursor: pointer;">{{item.SuppliesNum}}</span></td>
           <td>{{item.SuppliesName}}</td>
           <td>
-            <p v-for="(x,y) in item.GoodsSpecificationList" :key="y">{{x}}{{y+1==item.GoodsSpecificationList.length?'':'，'}}</p>
+            <span v-for="(x,y) in item.GoodsSpecificationList" :key="y">{{x}}{{y+1==item.GoodsSpecificationList.length?'':'，'}}</span>
           </td>
           <td>{{item.CategoryName}}</td>
           <td>{{item.BrandName}}</td>
@@ -109,6 +109,7 @@
         <el-popover
           popper-class="detailsIT_Journal"
           width="250"
+          @show="getdanjuList"
           trigger="click">
           <div class="InfoChangeLog" >
             <div class="changLog">
@@ -713,6 +714,7 @@
             if (res.data.resultCode === 1) {
               this.getDetail();
               this.Success(res.data.message);
+              this.getdanjuList()
               this.addMsg={
                 AuditDescription:'',
                 ImageList:[],

src/components/Materialman/rukuExamine.vue

@@ -81,9 +81,15 @@
                 <span class="ColorSpan greenSpan" v-if="item.StockInState==1">已</span>
                 {{item.StockInStateStr}}
               </td>
-              <td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInDate}}/{{item.StockInNum}}</td>
-              <td :rowspan="item.DetailList.length" v-if="index==0">{{item.WareHouseName}}/{{item.SupplierName}}</td>
+              <td :rowspan="item.DetailList.length" v-if="index==0">
+                <div>{{item.StockInDate}}</div>
+                <div>{{item.StockInNum}}</div>
 
+              </td>
+              <td :rowspan="item.DetailList.length" v-if="index==0">
+                <div>{{item.WareHouseName}}</div>
+                <div>{{item.SupplierName}}</div>
+              </td>
               <td>{{delist.SuppliesNum}}</td>
               <td style="width:300px">{{delist.SuppliesName}}</td>
               <td>
@@ -94,7 +100,7 @@
               <td>{{delist.UnitPrice}}</td>
               <td>{{delist.Money}}</td>
               <td>{{delist.Number}}</td>
-              <td :rowspan="item.DetailList.length" v-if="index==0">{{item.FinanceId}}</td>
+              <td :rowspan="item.DetailList.length" v-if="index==0">{{item.FinanceId>0?item.FinanceId:'-'}}</td>
               <td :rowspan="item.DetailList.length" v-if="index==0">
                 <p>{{item.UpdateBy}}</p>
                 <p>{{item.UpdateDate}}</p>

src/components/Materialman/rukudan.vue

@@ -58,15 +58,13 @@
                 <table v-loading="loading" style="margin-top:10px" class="myTable noHoverTable" border="0" cellspacing="0" cellpadding="0">
                     <thead>
                         <th width="75">入库状态</th>
-                        <th>入库时间</th>
-                        <th>入库单编码</th>
-                        <th>仓库名称</th>
-                        <th>供应商名称</th>
-
+                        <th>入库时间/编码</th>
+                        <th>仓库/供应商名称</th>
+                        <th>耗材编码</th>
                         <th>耗材名称</th>
 
                         <th>规格</th>
-                        <th>耗材编码</th>
+
                         <th>分类名称</th>
                         <th>品牌名称</th>
                         <th>单价</th>
@@ -85,22 +83,27 @@
                                     <span class="ColorSpan greenSpan" v-if="item.StockInState==1">已</span>
                                     {{item.StockInStateStr}}
                                 </td>
-                                <td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInDate}}</td>
-                                <td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInNum}}</td>
-                                <td :rowspan="item.DetailList.length" v-if="index==0">{{item.WareHouseName}}</td>
-                                <td :rowspan="item.DetailList.length" v-if="index==0">{{item.SupplierName}}</td>
+                                <td :rowspan="item.DetailList.length" v-if="index==0">
+                                  <div>{{item.StockInDate}}</div>
+                                  <div>{{item.StockInNum}}</div>
 
+                                </td>
+                                <td :rowspan="item.DetailList.length" v-if="index==0">
+                                  <div>{{item.WareHouseName}}</div>
+                                  <div>{{item.SupplierName}}</div>
+                                </td>
+                              <td>{{delist.SuppliesNum}}</td>
                                 <td style="width:300px">{{delist.SuppliesName}}</td>
-                                <td>
-                                    <p v-for="(x,y) in delist.GoodsSpecificationList" :key="y">{{x}}{{y+1==delist.GoodsSpecificationList.length?'':'，'}}</p>
+                                <td width="180">
+                                    <span v-for="(x,y) in delist.GoodsSpecificationList" :key="y">{{x}}{{y+1==delist.GoodsSpecificationList.length?'':'，'}}</span>
                                 </td>
-                                <td>{{delist.SuppliesNum}}</td>
+
                                 <td>{{delist.CategoryName}}</td>
                                 <td>{{delist.BrandName}}</td>
                                 <td>{{delist.UnitPrice}}</td>
                                 <td>{{delist.Money}}</td>
                                 <td>{{delist.Number}}</td>
-                                 <td :rowspan="item.DetailList.length" v-if="index==0">{{item.FinanceId}}</td>
+                                 <td :rowspan="item.DetailList.length" v-if="index==0">{{item.FinanceId>0?item.FinanceId:'-'}}</td>
                                 <td :rowspan="item.DetailList.length" v-if="index==0">
                                     <p>{{item.UpdateBy}}</p>
                                     <p>{{item.UpdateDate}}</p>