前端

src/views/statisticalReport/autoSettlementList.vue

@@ -1258,6 +1258,9 @@ export default {
         if (index === 0) {
           sums[index] = '合计'
         } else if (
+          index === 7 ||
+          index === 8 ||
+          index === 11 ||
           index === 13 ||
           index === 14 ||
           index === 15 ||
@@ -1284,6 +1287,9 @@ export default {
 			sums[sums.length-5]=sums[sums.length-5].toFixed(2)
       sums[sums.length-6]=sums[sums.length-6].toFixed(2)
       sums[sums.length-7]=sums[sums.length-7].toFixed(2)
+      sums[sums.length-9]=sums[sums.length-9].toFixed(2)
+      sums[sums.length-12]=sums[sums.length-12].toFixed(2)
+      sums[sums.length-13]=sums[sums.length-13].toFixed(2)
       return sums
     },
     //列表

src/views/taskManagement/moveWarehouseTask.vue

@@ -36,7 +36,7 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -5px;
+              left: -8px;
             "
             src="../../../public/img/sousuo.png"
             alt=""
@@ -406,7 +406,6 @@ export default {
 }
 /deep/.base_header_layout .grid-content.right .find.el-button--primary {
   width: 30px;
-  margin-left: 0;
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
 }

src/views/taskManagement/tranManagementTransport.vue

@@ -10,21 +10,10 @@
           v-hasPermission="
            `transportationTask.transportation.transportationInfo.add`
           "
-        ><img
-            width="13"
-            height="13"
-            style="
-              vertical-align: text-top;
-              position: relative;
-              top: 2px;
-              left: -4px;
-            "
-            src="../../../public/img/header-add.png"
-            alt=""
-          />添加</ws-button>
+        >添加</ws-button>
       </template>
       <template slot="right">
-        <span style="width: 142px; display: inline-block;color: #8890B1;">状态：</span>
+        <span style="width: 150px; display: inline-block;color: #8890B1;">状态：</span>
         <ws-select
           v-model="searchTypeText"
           placeholder=""
@@ -40,9 +29,9 @@
             style="color: #8890B1;"
           />
         </ws-select>
-        <span style="width: 142px; display: inline-block;color: #8890B1;">起点：</span>
+        <span style="width: 150px; display: inline-block;color: #8890B1;">起点：</span>
         <el-input label="起点" placeholder="请输入起点" clearable maxlength="200" type="input" v-model="start"></el-input>
-        <span style="width: 142px; display: inline-block;color: #8890B1;">终点：</span>
+        <span style="width: 150px; display: inline-block;color: #8890B1;">终点：</span>
         <el-input label="终点" placeholder="请输入终点" clearable maxlength="200" type="input" v-model="end"></el-input>
         <el-input
           v-model="searchKeyWord"
@@ -504,7 +493,6 @@ export default {
 }
 /deep/.base_header_layout .grid-content.right .find.el-button--primary {
   width: 30px;
-  margin-left: 0;
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
 }

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -20,7 +20,7 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -7px;
+              left: -8px;
             " src="../../../public/img/sousuo.png" alt />
         </ws-button>
       </template>
@@ -54,7 +54,7 @@
             </div>
           </template> -->
         </el-table-column>
-        <el-table-column prop="warehouseName" class="table_td" label="库房名"></el-table-column>
+        <el-table-column prop="warehouseName" class="table_td" label="仓库名"></el-table-column>
         <el-table-column prop="inOutType" class="table_td" label="出入库类型"></el-table-column>
         <el-table-column prop="goodsName" class="table_td" label="货名"></el-table-column>
         <el-table-column prop="weight" class="table_td" label="重量（吨）"></el-table-column>
@@ -465,10 +465,8 @@
 
   /deep/.base_header_layout .grid-content.right .find.el-button--primary {
     width: 30px;
-    margin-left: 0;
     border-top-left-radius: 0px;
     border-bottom-left-radius: 0px;
-    margin-left:10px;
   }
 
   /deep/.findValue .el-input__inner {

src/views/tranManagement/tranManagementDriver.vue

@@ -35,9 +35,9 @@
           clearable
           maxlength="200"
           type="input"
-          class="findValue"
+          class="findValue findinput"
         ></ws-input>
-        <ws-button type="primary" @click="handleLook()">
+        <ws-button class='find' type="primary" @click="handleLook()">
           <img
             width="14"
             height="16"
@@ -682,6 +682,16 @@ export default {
 .findValue {
   margin: 0 10px;
 }
+/deep/.base_header_layout .find.el-button--primary {
+  width: 30px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+  margin-left:-10px;
+}
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
 /deep/.el-icon-arrow-right {
   display: none;
 }

src/views/warehouse/costmanagement.vue

@@ -36,19 +36,8 @@
           />
         </ws-select>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
-            width="16"
-            height="16"
-            style="
-              vertical-align: text-top;
-              position: relative;
-              top: 0px;
-              left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
+        <ws-button type="primary" @click="find()"
+          >查找</ws-button>
       </template>
     </BaseHeaderLayout>
       <el-table

src/views/warehouse/tranManagementWarehouseInOutTask.vue

@@ -103,7 +103,7 @@
         <el-table-column
           prop="warehouseName"
           class="table_td"
-          label="库房名"
+          label="仓库名"
         ></el-table-column>
         <el-table-column
           prop="inOutType"

src/views/warehouse/warehouseManagementPutOut.vue

@@ -62,7 +62,7 @@
         <el-table-column class="table_td" prop="contractNo" label="合同编号">
 
         </el-table-column>
-        <el-table-column class="table_td"  prop="warehouseName" label="库房名" >
+        <el-table-column class="table_td"  prop="warehouseName" label="仓库名" >
          
         </el-table-column>
         <el-table-column class="table_td"  prop="inOutType" label="出入库类型">

src/views/warehouse/warehouseManagementPutOutLook.vue

@@ -55,8 +55,8 @@
               ></el-option>
             </el-input>
           </el-form-item>
-          <!-- 库房名 -->
-          <el-form-item label="库房名">
+          <!-- 仓库名 -->
+          <el-form-item label="仓库名">
             <el-input
               disabled
               v-model="dataList.warehouseName"