Merge branch 'dev' of git.echepei.com:zhujiawei/Warehouse_management_ui into dev

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1142,7 +1142,7 @@
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="a">收货单</el-dropdown-item>
                   <el-dropdown-item command="z">标准入库单</el-dropdown-item>
-                  <!-- <el-dropdown-item command="b">入库单</el-dropdown-item> -->
+<!--                  <el-dropdown-item command="b">入库单</el-dropdown-item>-->
                   <el-dropdown-item command="c">理货单</el-dropdown-item>
                   <el-dropdown-item command="d">货物确认</el-dropdown-item>
                   <el-dropdown-item command="e">劳务确认</el-dropdown-item>
@@ -1884,7 +1884,7 @@
             </tr>
             <tr>
               <td>序号</td>
-              <td>出库日期</td>
+              <td>入库日期</td>
               <td>箱量(20GP)</td>
               <td>重量</td>
               <td>件数</td>

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -82,7 +82,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8" v-if="dataShowcar == 1">
+        <el-col :span="8">
           <el-form-item label="结算方式" prop="fStltypeid">
             <el-select
               v-model="form.fStltypeid"
@@ -100,29 +100,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8" v-else>
-          <el-form-item label="作业类型" prop="fBusinessType">
-            <el-select
-              style="width: 80%"
-              v-model="form.fBusinessType"
-              filterable
-              @change="educationChange"
-              :disabled="
-                browseStatus ||
-                warehouseDrList.length > 0 ||
-                warehouseCrList.length > 0 ||
-                form.warehouseStatus > 3
-              "
-            >
-              <el-option
-                v-for="(item, index) in businessTypeOption"
-                :key="index.dictValue"
-                :label="item.dictLabel"
-                :value="item.dictValue"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="提单号" prop="fMblno">
             <el-input
@@ -293,25 +270,7 @@
       </el-row>
       <div v-if="detailsHidden2">
         <el-row>
-          <el-col :span="8" v-if="dataShowcar == 0">
-            <el-form-item label="结算方式" prop="fStltypeid">
-              <el-select
-                v-model="form.fStltypeid"
-                placeholder="请选择结算方式"
-                clearable
-                :disabled="browseStatus || form.warehouseStatus > 3"
-                style="width: 80%"
-              >
-                <el-option
-                  v-for="(item, index) in fStltypeOptions"
-                  :key="index.dictValue"
-                  :label="item.dictLabel"
-                  :value="item.dictValue"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" v-else>
+          <el-col :span="8">
             <el-form-item label="作业类型" prop="fBusinessType">
               <el-select
                 style="width: 80%"
@@ -859,7 +818,7 @@
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="d">标准出库单</el-dropdown-item>
-                  <!-- <el-dropdown-item command="b">出库单</el-dropdown-item> -->
+<!--                  <el-dropdown-item command="b">出库单</el-dropdown-item>-->
                   <el-dropdown-item command="c">理货单</el-dropdown-item>
                   <el-dropdown-item command="e">出库确认</el-dropdown-item>
                   <el-dropdown-item command="e">劳务确认</el-dropdown-item>
@@ -2239,7 +2198,7 @@
             </tr>
             <tr>
               <td>序号</td>
-              <td>入货日期</td>
+              <td>出货日期</td>
               <td>箱量(20GP)</td>
               <td>重量</td>
               <td>件数</td>

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -88,7 +88,6 @@
           <el-form-item
             label="结算方式"
             prop="fStltypeid"
-            v-if="dataShowcar == '1'"
           >
             <el-select
               v-model="form.fStltypeid"
@@ -105,27 +104,6 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="作业类型" prop="fBusinessType" v-else>
-            <el-select
-              style="width: 80%"
-              v-model="form.fBusinessType"
-              filterable
-              @change="educationChange"
-              :disabled="
-                contrOl ||
-                browseStatus ||
-                warehouseDrList.length > 0 ||
-                warehouseCrList.length > 0
-              "
-            >
-              <el-option
-                v-for="(item, index) in businessTypeOption"
-                :key="index.dictValue"
-                :label="item.dictLabel"
-                :value="item.dictValue"
-              ></el-option>
-            </el-select>
-          </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="提单号" prop="fMblno">
@@ -284,7 +262,6 @@
           <el-form-item
             label="作业类型"
             prop="fBusinessType"
-            v-if="dataShowcar == '1'"
           >
             <el-select
               style="width: 80%"
@@ -306,22 +283,6 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="结算方式" prop="fStltypeid" v-else>
-            <el-select
-              v-model="form.fStltypeid"
-              placeholder="请选择结算方式"
-              clearable
-              :disabled="browseStatus"
-              style="width: 80%"
-            >
-              <el-option
-                v-for="(item, index) in fStltypeOptions"
-                :key="index.dictValue"
-                :label="item.dictLabel"
-                :value="item.dictValue"
-              />
-            </el-select>
-          </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="劳务公司" prop="fLabour">

src/views/reportManagement/profitGeneralLedger/index.vue

@@ -295,7 +295,7 @@ import Cookies from "js-cookie";
 import draggable from "vuedraggable";
 
 export default {
-  name: 'generalLedgerDr',
+  name: 'profitGeneralLedger',
   components: {draggable},
   data() {
     return {
@@ -739,4 +739,4 @@ export default {
   background-color: rgba(0, 0, 0, 0.05);
   height: 100%;
 }
-</style>
+</style>