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

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -814,12 +814,12 @@
                 <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="c">理货单</el-dropdown-item>
-                  <el-dropdown-item command="e">出库确认</el-dropdown-item>
-                  <el-dropdown-item command="e">劳务确认</el-dropdown-item>
-                  <!--                  <el-dropdown-item command="f">叉车出库单</el-dropdown-item>-->
-                  <!--                  <el-dropdown-item command="g">单车出库单</el-dropdown-item>-->
-                  <!--                  <el-dropdown-item command="h">装车存档出库单</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>-->
+                                    <el-dropdown-item command="f">叉车出库单</el-dropdown-item>
+                                    <el-dropdown-item command="g">单车出库单</el-dropdown-item>
+                                    <el-dropdown-item command="h">装车存档出库单</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
               <div style="margin: 0 10px">

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -743,7 +743,7 @@
                   <el-dropdown-item command="a">收货单</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="d">调拨单</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
               <div style="margin: 0 10px">

src/views/finance/charge/index.vue

@@ -312,7 +312,7 @@
             <span v-if="item.label == 'fCtrlcorpid'">{{scope.row.fCtrlcorpid}}</span>
             <span v-if="item.label == 'createTime'">{{scope.row.createTime?scope.row.createTime.slice(0,10):''}}</span>
             <span v-if="item.label == 'fAccbilldate'">{{scope.row.fAccbilldate}}</span>
-            <span v-if="item.label == 'tMblno'">{{scope.row.tMblno}}</span>
+            <span v-if="item.label == 'fMblno'">{{scope.row.fMblno}}</span>
             <span v-if="item.label == 'chargingMethod'">{{scope.row.chargingMethod}}</span>
             <span v-if="item.label == 'invoiceNo'">{{scope.row.invoiceNo}}</span>
             <span v-if="item.label == 'bank'">{{scope.row.bank}}</span>
@@ -863,7 +863,7 @@
           </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="提单号" prop="tMblno">
+              <el-form-item label="提单号" prop="fMblno">
             <el-input
               v-model="queryParameter.fMblno"
               placeholder="请输入提单号"
@@ -1428,7 +1428,7 @@ export default {
         },
         {
           surface: "6",
-          label: "tMblno",
+          label: "fMblno",
           name: "提单号",
           checked: 0,
           width: 100,
@@ -1755,7 +1755,7 @@ export default {
         fBillno: null,
         fCtrlcorpid: null,
         fCorpid: null,
-        tMblno: null,
+        fMblno: null,
         fAmtdr: null,
         fAmtcr: null,
         fBilltype: null,
@@ -2844,7 +2844,7 @@ export default {
                 this.pass.fName = this.nothing[0] + "...";
               }
               // this.increase_s = this.increase_s.concat(this.selection);
-              this.queryParams.tMblno = this.pass.fMblno; //提单号
+              this.queryParams.fMblno = this.pass.fMblno; //提单号
               this.queryParams.fCtrlcorpid = this.pass.fName;
               this.queryParams.fCorpid = this.queryParameter.fToCorpid;
               this.queryParams.fAmtcr = this.pass.fAmtcr
@@ -2894,7 +2894,7 @@ export default {
                     this.pass.fName = this.nothing[0] + "...";
                   }
                   // this.increase_s = this.increase_s.concat(this.selection);
-                  this.queryParams.tMblno = this.pass.fMblno; //提单号
+                  this.queryParams.fMblno = this.pass.fMblno; //提单号
                   this.queryParams.fCtrlcorpid = this.pass.fName;
                   this.queryParams.fCorpid = this.queryParameter.fToCorpid;
                   this.queryParams.fAmtcr = Number(this.pass.fAmtcr).toFixed(2);
@@ -3008,7 +3008,7 @@ export default {
         fBillno: null,
         fCtrlcorpid: null,
         fCorpid: null,
-        tMblno: null,
+        fMblno: null,
         fAmtdr: null,
         fAmtcr: null,
         fBilltype: null,
@@ -3194,7 +3194,7 @@ export default {
         fBillno: null,
         fCtrlcorpid: null,
         fCorpid: null,
-        tMblno: null,
+        fMblno: null,
         fAmtdr: null,
         fAmtcr: null,
         fBilltype: null,