Browse Source

前端 sdy

zhongtianhaoyuan 3 years ago
parent
commit
49ce578f21

+ 4 - 1
src/views/houseSelfCollect/acquisitionManagement.vue

@@ -30,6 +30,7 @@
           >允许手动编辑重量</el-checkbox>
           >允许手动编辑重量</el-checkbox>
         </div>
         </div>
       </template>
       </template>
+    
     </BaseHeaderLayout>
     </BaseHeaderLayout>
     <!-- <div class="header">
     <!-- <div class="header">
       <div>
       <div>
@@ -45,7 +46,7 @@
       <acquisitionManagementAdd></acquisitionManagementAdd>
       <acquisitionManagementAdd></acquisitionManagementAdd>
     </el-dialog>
     </el-dialog>
     <div class="table-content">
     <div class="table-content">
-      <el-table :data="tableData" style="width: 100%;margin-top: 20px" border height="780">
+      <el-table :data="tableData" style="width: 100%;margin-top: 20px;" border height="600" >
         <el-table-column type="index" label="序号">
         <el-table-column type="index" label="序号">
           <template scope="scope">
           <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -355,5 +356,7 @@ export default {
 
 
 .paging {
 .paging {
   text-align: center;
   text-align: center;
+  margin-top:20px
 }
 }
+
 </style>
 </style>

+ 5 - 2
src/views/houseSelfCollect/customerManagement.vue

@@ -28,7 +28,7 @@
       </div>
       </div>
     </div>
     </div>
 
 
-    <el-table :data="customertList" style="width: 100%; margin-top: 20px" ref="customertList" border height="780">
+    <el-table :data="customertList" style="width: 100%; margin-top: 20px" ref="customertList" border height="600">
       <el-table-column type="index" label="序号">
       <el-table-column type="index" label="序号">
         <template scope="scope">
         <template scope="scope">
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -53,7 +53,7 @@
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
-    <div style="text-align: center">
+    <div style="text-align: center;margin-top:20px">
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
         :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
         :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal">
         :total="deptBudgetTotal">
@@ -226,4 +226,7 @@
   /deep/.el-table--enable-row-transition .el-table__body td {
   /deep/.el-table--enable-row-transition .el-table__body td {
     text-align: center;
     text-align: center;
   }
   }
+//   /deep/.el-table--border{
+//   height: calc(100vh - 600px) !important;
+// }
 </style>
 </style>

+ 2 - 2
src/views/houseSelfCollect/inspectInfo.vue

@@ -61,8 +61,8 @@
                 <ws-input v-else type="number" @mousewheel.native.prevent v-model="inspect.reBuckleMiscellaneous" placeholder="未复检" maxlength="100" size="small"
                 <ws-input v-else type="number" @mousewheel.native.prevent v-model="inspect.reBuckleMiscellaneous" placeholder="未复检" maxlength="100" size="small"
                 disabled />
                 disabled />
             </ws-form-item>
             </ws-form-item>
-            <ws-form-item label="类型" span="1" prop="type">
-              <ws-select v-model="inspect.type" :disabled="disabled2" @change="typeChange">
+            <ws-form-item label="类型" span="1" prop="type"  >
+              <ws-select v-model="inspect.type" :disabled="disabled" @change="typeChange">
                 <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
                 <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
               </ws-select>
               </ws-select>
             </ws-form-item>
             </ws-form-item>

+ 8 - 2
src/views/houseSelfCollect/inspectionManagement.vue

@@ -23,7 +23,8 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
 			</template>
 			</template>
 		</BaseHeaderLayout>
 		</BaseHeaderLayout>
-		<el-table :data="inspect" style="width: 100%; margin-top: 20px" ref="inspect" border height="780">
+		<!-- <div style="height:calc(100vh - 600px)"> -->
+		<el-table :data="inspect" style="width: 100%; margin-top: 20px" ref="inspect" border height="600">
 			<el-table-column type="index" label="序号" width="50">
 			<el-table-column type="index" label="序号" width="50">
 				<template scope="scope">
 				<template scope="scope">
 					<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
 					<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -104,6 +105,7 @@
 				</template>
 				</template>
 			</el-table-column>
 			</el-table-column>
 		</el-table>
 		</el-table>
+		
 		 <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单">
 		 <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单">
 			<!-- <inspectInfoPrint :printData="printData"></inspectInfoPrint> -->
 			<!-- <inspectInfoPrint :printData="printData"></inspectInfoPrint> -->
 			<inspectInfoPrint :printData="printData" ref="saveImg"></inspectInfoPrint>
 			<inspectInfoPrint :printData="printData" ref="saveImg"></inspectInfoPrint>
@@ -113,12 +115,13 @@
 				<el-button type="primary" @click="printBig">打印单据</el-button>
 				<el-button type="primary" @click="printBig">打印单据</el-button>
 			</div>
 			</div>
 		</el-dialog>
 		</el-dialog>
-		<div style="text-align: center">
+		<div style="text-align: center;margin-top:20px">
 			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
 			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
 				:current-page="currentPage" :page-size="deptCircularPage.pageSize"
 				:current-page="currentPage" :page-size="deptCircularPage.pageSize"
 				layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 				layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 			</el-pagination>
 			</el-pagination>
 		</div>
 		</div>
+		<!-- </div> -->
 	</div>
 	</div>
 </template>
 </template>
 <script>
 <script>
@@ -388,4 +391,7 @@
 		width: 45%;
 		width: 45%;
 		display: inline-block;
 		display: inline-block;
 	}
 	}
+// 	/deep/.el-table--border{
+//   height: calc(100vh - 600px) !important;
+// }
 </style>
 </style>

+ 2 - 2
src/views/houseSelfCollect/weighingManagement.vue

@@ -19,7 +19,7 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
 			</template>
 			</template>
 		</BaseHeaderLayout>
 		</BaseHeaderLayout>
-		<el-table :data="weighingList" style="width: 100%; margin-top: 20px" ref="weighingList" border height="780">
+		<el-table :data="weighingList" style="width: 100%; margin-top: 20px" ref="weighingList" border height="600">
 			<el-table-column type="index" label="序号" width="50">
 			<el-table-column type="index" label="序号" width="50">
 				<template scope="scope">
 				<template scope="scope">
 					<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
 					<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -69,7 +69,7 @@
 				</template>
 				</template>
 			</el-table-column>
 			</el-table-column>
 		</el-table>
 		</el-table>
-		<div style="text-align: center">
+		<div style="text-align: center;margin-top:20px">
 			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
 			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
 				:current-page="currentPage" :page-size="deptCircularPage.pageSize"
 				:current-page="currentPage" :page-size="deptCircularPage.pageSize"
 				layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 				layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">

+ 1 - 0
src/views/statisticalReport/stockSaleOutReportList.vue

@@ -49,6 +49,7 @@
 				</span>
 				</span>
 				<span v-else>定金: 0 元</span>
 				<span v-else>定金: 0 元</span>
 			</div>
 			</div>
+			
 
 
 			<el-table class="wenzi" :data="saleList.records" style="width: 100%; margin-top: 20px" ref="saleList" border
 			<el-table class="wenzi" :data="saleList.records" style="width: 100%; margin-top: 20px" ref="saleList" border
 				:summary-method="getSummaries" show-summary @selection-change="handleSelectionChange">
 				:summary-method="getSummaries" show-summary @selection-change="handleSelectionChange">

+ 43 - 89
src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -126,7 +126,7 @@
             >
             >
            </div>
            </div>
           </div>
           </div>
-          <div
+        <div
             class="position siji"
             class="position siji"
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
             :key="index"
             :key="index"
@@ -435,7 +435,7 @@
             <img width="22" height="22" src="../../../public/img/add.png" alt />
             <img width="22" height="22" src="../../../public/img/add.png" alt />
             <div class="spans">添加仓位</div>
             <div class="spans">添加仓位</div>
           </el-button>
           </el-button>
-        </div>
+          </div>
       </ws-form>
       </ws-form>
       <div style="text-align: right; padding: 10px">
       <div style="text-align: right; padding: 10px">
         <el-button
         <el-button
@@ -931,8 +931,7 @@ export default {
   padding: 16px 20px;
   padding: 16px 20px;
 }
 }
 .center {
 .center {
-  width: 90%;
-  // margin: 0 auto;
+  margin: 0 auto;
 }
 }
 
 
 //表格文字
 //表格文字
@@ -999,15 +998,13 @@ export default {
   color: #8890b1;
   color: #8890b1;
   line-height: 16px;
   line-height: 16px;
 }
 }
-.position {
-  width: 90%;
-}
+
 //下表格样式
 //下表格样式
 .position.siji {
 .position.siji {
   background: white;
   background: white;
   border-radius: 4px;
   border-radius: 4px;
   /* border: 1px solid #d8dce6; */
   /* border: 1px solid #d8dce6; */
-  width: 1219px;
+  // width: 1219px;
 }
 }
 /deep/.zi {
 /deep/.zi {
   width: 64px;
   width: 64px;
@@ -1040,7 +1037,7 @@ export default {
 }
 }
 /deep/.basicInformation {
 /deep/.basicInformation {
   .el-form-item {
   .el-form-item {
-    width: 25%;
+    // width: 25%;
 
 
     .el-form-item__label {
     .el-form-item__label {
       background: transparent;
       background: transparent;
@@ -1085,22 +1082,23 @@ export default {
 }
 }
 .basicInformation .ws-info-table {
 .basicInformation .ws-info-table {
   border: none;
   border: none;
-  width: 1000px;
+  width: 100%;
+  margin: 0 auto;
 }
 }
 /deep/.el-select .el-input__inner {
 /deep/.el-select .el-input__inner {
   border: 1px solid #ccc !important;
   border: 1px solid #ccc !important;
   padding: 0 15px !important;
   padding: 0 15px !important;
   font-size: 12px !important;
   font-size: 12px !important;
-  width: 125px;
+  // width: 125px;
 }
 }
 .zhong {
 .zhong {
-  height: 111px;
   background: #f6f7fc;
   background: #f6f7fc;
   border-radius: 4px;
   border-radius: 4px;
   border: 1px solid #d8dce6;
   border: 1px solid #d8dce6;
-  width: 99%;
-  margin: 0 2%;
-  // margin-left: -76px;
+  width: 100%;
+}
+/deep/.zhong .el-form-item{
+  width: 20%;
 }
 }
 .bg-left {
 .bg-left {
   padding-left: 30px;
   padding-left: 30px;
@@ -1109,12 +1107,7 @@ export default {
   padding-left: 30px;
   padding-left: 30px;
   width: 150px;
   width: 150px;
 }
 }
-.basicInformation .ws-info-table {
-  border: none;
-  width: 141%;
-  margin: 0 auto;
-  // margin-left: -89px;
-}
+
 .ys {
 .ys {
   // margin-left: 300px;
   // margin-left: 300px;
   width: 100px;
   width: 100px;
@@ -1166,9 +1159,7 @@ export default {
   left: 0px;
   left: 0px;
   top: 13px;
   top: 13px;
 }
 }
-.position {
-  position: relative;
-}
+
 
 
 .del {
 .del {
   // position: absolute;
   // position: absolute;
@@ -1189,12 +1180,11 @@ export default {
   width: 300px;
   width: 300px;
   height: 300px;
   height: 300px;
 }
 }
-.el-form {
-  padding: 0 15%;
-}
+
 /deep/.ws-info-table .el-form-item {
 /deep/.ws-info-table .el-form-item {
   border-right: 1px solid transparent;
   border-right: 1px solid transparent;
   border-bottom: 1px solid transparent;
   border-bottom: 1px solid transparent;
+  width: 33.3333%;
 }
 }
 .readonly {
 .readonly {
   position: relative;
   position: relative;
@@ -1227,16 +1217,28 @@ export default {
 .el-col {
 .el-col {
   background: #f6f7fc;
   background: #f6f7fc;
 }
 }
+
 /deep/.ws-info-table .el-form-item .el-form-item__content {
 /deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  // border: 1px solid #d8dce6;
+  margin-bottom: 5px;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
   padding: 0 25px;
   padding: 0 25px;
-  border-left: 1px solid transparent;
-  background: #fff;
+  // border-left: 1px solid transparent;
+  border: none;
 }
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 100px;
   width: 100px;
   text-align: center;
   text-align: center;
   background: #fff;
   background: #fff;
-  // border: 1px solid #cdd2dc;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
 }
 }
 .button-container {
 .button-container {
   display: flex;
   display: flex;
@@ -1299,14 +1301,9 @@ export default {
   padding-right: 10px;
   padding-right: 10px;
   text-align: right;
   text-align: right;
 }
 }
-.center {
-  width: 86%;
-  // margin: 0 auto;
-  // margin: 0 -29%;
-}
-.el-form-item {
-  width: 50%;
-}
+// .el-form-item {
+//   width: 50%;
+// }
 .el-form-item__label {
 .el-form-item__label {
   text-align: center;
   text-align: center;
 }
 }
@@ -1359,8 +1356,6 @@ export default {
     display: none;
     display: none;
   }
   }
   .el-input__inner {
   .el-input__inner {
-    background-color: #fff;
-    border-color: #fff !important;
     color: #000 !important;
     color: #000 !important;
     font-size: 14px;
     font-size: 14px;
     cursor: text;
     cursor: text;
@@ -1374,9 +1369,7 @@ export default {
   overflow: scroll;
   overflow: scroll;
   height: 93vh;
   height: 93vh;
 }
 }
-.ws-info-table .el-form-item {
-  width: 33.3333%;
-}
+
 .readonly:after {
 .readonly:after {
   display: none;
   display: none;
 }
 }
@@ -1385,6 +1378,7 @@ export default {
 }
 }
 .el-form {
 .el-form {
   margin-top: 50px;
   margin-top: 50px;
+  padding: 0 15%;
 }
 }
 .readonly {
 .readonly {
   width: 16%;
   width: 16%;
@@ -1399,35 +1393,8 @@ export default {
   border-left: 0px;
   border-left: 0px;
   border-top: 0px;
   border-top: 0px;
 }
 }
-/deep/.ws-info-table .el-form-item {
-  border: none;
-  height: 50px;
-  // margin: 0 auto;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  font-family: PingFangSC-Regular, PingFang SC;
-  margin-bottom: 5px;
-  background-color: #fff;
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  background-color: #fff;
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-}
+
+
 /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
 /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
   border: 0px;
 }
 }
@@ -1463,20 +1430,7 @@ export default {
 //   border-radius: 10px;
 //   border-radius: 10px;
 //   right: 20px;
 //   right: 20px;
 // }
 // }
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  /* background-color: #fff; */
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-  background: border-box;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  /* border: 1px solid #d8dce6; */
-  border: none;
-}
+
 /deep/.basicInformation .el-form-item .el-form-item__label {
 /deep/.basicInformation .el-form-item .el-form-item__label {
   background: transparent;
   background: transparent;
   border: none;
   border: none;
@@ -1487,9 +1441,9 @@ export default {
   line-height: 16px;
   line-height: 16px;
   margin-left: 22px;
   margin-left: 22px;
 }
 }
-/deep/.el-form-item__content .el-select {
-  width: 42%;
-}
+// /deep/.el-form-item__content .el-select {
+//   width: 42%;
+// }
 //减号
 //减号
 .del {
 .del {
   position: absolute;
   position: absolute;

+ 1 - 2
src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -811,8 +811,6 @@ export default {
     display: none;
     display: none;
   }
   }
   .el-input__inner {
   .el-input__inner {
-    background-color: #fff;
-    border-color: #fff !important;
     color: #000 !important;
     color: #000 !important;
     font-size: 14px;
     font-size: 14px;
     cursor: text;
     cursor: text;
@@ -947,4 +945,5 @@ export default {
     height: 40px;
     height: 40px;
     margin: 20px 0;
     margin: 20px 0;
   }
   }
+
 </style>
 </style>