Browse Source

xzt-851,840,854,875,841

黄梓星 1 năm trước cách đây
mục cha
commit
e53681821f

+ 8 - 0
src/views/purchase/DemandSummary/add.vue

@@ -13,6 +13,7 @@
       <el-table 
           :data="tableList" 
           fit
+          border
           max-height="680"
           style="font-size: 12px;"
           @selection-change="handleSelectionChange"
@@ -194,6 +195,10 @@ export default {
             return '新品需求'
           case 'HZBM':
             return '合作部门需求'
+          case 'DZBH':
+            return '大宗备货'
+          case 'XZCG':
+            return '行政类采购'
         }
       },
       // 不能直接改变props传来的值
@@ -338,4 +343,7 @@ export default {
   display: flex;
   justify-content: flex-end;
 } 
+::v-deep .el-table__row > td {
+  border: none;
+}
 </style>

+ 4 - 0
src/views/purchase/DemandSummary/index.vue

@@ -220,6 +220,7 @@
         <el-table 
           :data="tableList" 
           fit
+          border
           show-summary
           :summary-method="getSummaries"
           max-height="550"
@@ -799,4 +800,7 @@ export default {
   margin-top: 10px;
   text-align: right;
 }
+::v-deep .el-table__row > td {
+  border: none;
+}
 </style>

+ 10 - 5
src/views/purchase/PurchaseDemandList/add.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="addDemandList">
-    <el-card>
+  <el-card style="height: calc(100vh - 180px);">
     <span>基本信息</span>
     <el-form :model="basicForm" :rules="basicRules" ref="basic" label-width="auto">
       <el-row :gutter="10">
@@ -23,14 +23,14 @@
             </el-form-item>
          </el-col>
 
-         <el-col :span="1.5">
+         <!-- <el-col :span="1.5">
             <el-form-item label="需求处理方式">
               <el-select disabled v-model="basicForm.demandBusinessType" size="mini" style="width: 200px">
                 <el-option v-for="dict in dict.type.sys_processing_mode" :key="dict.value" :label="dict.label" :value="dict.value">
                 </el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
 
          <el-col :span="1.5">
             <el-form-item label="单据状态">
@@ -163,7 +163,8 @@
       <el-table 
           :data="basicForm.puDemandItemList" 
           fit
-          max-height="300"
+          border
+          max-height="350"
           style="font-size: 12px;"
           @selection-change="handleSelectionChange"
           :cell-class-name="cellClassName"
@@ -269,7 +270,7 @@
               </template>
             </el-table-column>
           <el-table-column show-overflow-tooltip label="月均销量" align="center"  prop="averageQtyMonth" width="120px"/>
-          <el-table-column show-overflow-tooltip label="实际(业务)需求量" align="center"  prop="qty" width="120px">
+          <el-table-column show-overflow-tooltip label="实际(业务)需求量" align="center"  prop="qty" width="150px">
             <template slot-scope="scope">
               <el-form-item class="hang" :prop="'puDemandItemList.' + scope.$index + '.' + 'qty'" :rules="{ required: true, message: '请填写实际(业务)需求量', trigger: 'blur' }">
                 <el-input type="number" min="0" clearable :readonly="sonDisable" size="mini" v-model="scope.row.qty" @input="getYLSL(scope)"/>
@@ -785,6 +786,7 @@ export default {
         item.contacts = ''
         item.contactsPhone = ''
         item.address = ''
+        item.statusAllot = 'N'
       })
     },
     handleData() {
@@ -1633,4 +1635,7 @@ export default {
 .el-table ::v-deep .success-row {
   background: #f11616;
 }
+::v-deep .el-table__row > td {
+  border: none;
+}
 </style>

+ 8 - 0
src/views/purchase/PurchaseDemandList/index.vue

@@ -159,6 +159,7 @@
         <el-table 
           :data="tableList" 
           fit
+          border
           max-height="550"
           style="font-size: 12px;"
           @selection-change="handleSelectionChange"
@@ -404,6 +405,10 @@ export default {
           return '新品需求'
         case 'HZBM':
           return '合作部门需求'
+        case 'DZBH':
+          return '大宗备货'
+        case 'XZCG':
+          return '行政类采购'
       }
     },
     formatterSource(row) {
@@ -715,4 +720,7 @@ export default {
   margin-top: 10px;
   text-align: right;
 }
+::v-deep .el-table__row > td {
+  border: none;
+}
 </style>

+ 7 - 0
src/views/purchase/transferOrder/add.vue

@@ -448,6 +448,7 @@
           <el-table
             :data="materialInfo"
             fit
+            border
             max-height="480"
             style="font-size: 12px"
             :row-class-name="rowClassName"
@@ -935,6 +936,7 @@
           <el-table
             :data="receiveInfo"
             fit
+            border
             max-height="480"
             style="font-size: 12px"
           >
@@ -1135,6 +1137,7 @@
           <el-table
             :data="priceList"
             fit
+            border
             max-height="480"
             style="font-size: 12px"
           >
@@ -1265,6 +1268,7 @@
           <el-table
             :data="resultList"
             fit
+            border
             max-height="480"
             style="font-size: 12px"
           >
@@ -2309,4 +2313,7 @@ export default {
 .hang ::v-deep .el-form-item__content {
   margin-left: 0px !important;
 }
+::v-deep .el-table__row > td {
+  border: none;
+}
 </style>

+ 9 - 1
src/views/purchase/transferOrder/index.vue

@@ -95,6 +95,7 @@
         <el-table 
           :data="tableList" 
           fit
+          border
           show-summary
           highlight-current-row
           max-height="680"
@@ -165,6 +166,7 @@
             <el-table
             :data="materialInfo" 
             fit
+            border
             max-height="380"
             style="font-size: 12px;"
             >
@@ -194,7 +196,7 @@
             <el-table-column show-overflow-tooltip label="商品名" align="center" prop="productCode" width="150px"/>
             <el-table-column show-overflow-tooltip label="通用名" align="center" prop="commonCode" width="150px"/>
             <el-table-column show-overflow-tooltip label="剂型" align="center" prop="drug" width="150px"/>
-            <el-table-column show-overflow-tooltip label="调入调出结算规则明细" align="center" prop="ruleDetail" width="150px"/>
+            <el-table-column show-overflow-tooltip label="调入调出结算规则明细" align="center" prop="ruleDetail" width="180px"/>
             <el-table-column show-overflow-tooltip label="上市许可持有人" align="center" prop="marketingApprovalPersonal" width="150px"/>
             <el-table-column show-overflow-tooltip label="生产许可证号/经营许可证号/备案凭证号" align="center" prop="production" width="260px"/>
             <el-table-column show-overflow-tooltip label="pi码" align="center" prop="pi" width="150px"/>
@@ -210,6 +212,7 @@
             <el-table
             :data="receiveInfo" 
             fit
+            border
             max-height="380"
             style="font-size: 12px;"
             >
@@ -249,6 +252,7 @@
             <el-table
             :data="priceList" 
             fit
+            border
             max-height="380"
             style="font-size: 12px;"
             >
@@ -284,6 +288,7 @@
             <el-table
             :data="resultList" 
             fit
+            border
             max-height="380"
             style="font-size: 12px;"
             >
@@ -501,4 +506,7 @@ export default {
   margin-top: 10px;
   text-align: right;
 }
+::v-deep .el-table__row > td {
+  border: none;
+}
 </style>