2024年4月13日10:58:39

package.json

@@ -5,7 +5,7 @@
   "author": "途宝",
   "license": "MIT",
   "scripts": {
-    "dev": "vue-cli-service serve",
+    "dev": "vue-cli-service serve --open",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
@@ -82,7 +82,7 @@
     "babel-jest": "23.6.0",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "chalk": "2.4.2",
-    "chokidar": "2.1.5",
+    "chokidar": "^2.1.5",
     "connect": "3.6.6",
     "eslint": "6.7.2",
     "eslint-plugin-vue": "6.2.2",
@@ -91,6 +91,7 @@
     "lint-staged": "8.1.5",
     "mockjs": "1.0.1-beta3",
     "node-sass": "4.14.1",
+    "nodemon": "^3.1.0",
     "plop": "2.3.0",
     "runjs": "4.3.2",
     "sass-loader": "8.0.2",

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -121,7 +121,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="计划通关件数" prop="fPlanqty">
-            <el-input v-model.number="form.fPlanqty" style="width: 80%" maxlength="9" laceholder="计划件数"
+            <el-input v-model="form.fPlanqty" v-input-limit="2" style="width: 80%" maxlength="9" laceholder="计划件数"
               :disabled="browseStatus || current !== before" />
           </el-form-item>
         </el-col>

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -226,7 +226,7 @@
         <el-col :span="8">
           <el-form-item label="计划件数" prop="fPlanqty">
             <el-input
-                v-model.number="form.fPlanqty"
+                v-model="form.fPlanqty"
                 style="width: 80%"
                 maxlength="9"
                 laceholder="计划件数"

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -309,10 +309,10 @@
         <el-col :span="8">
           <el-form-item label="计划件数" prop="fPlanqty">
             <el-input
-              v-model.number="form.fPlanqty"
+              v-model="form.fPlanqty"
               style="width: 80%"
               maxlength="9"
-              v-input-limit="0"
+              v-input-limit="2"
               placeholder="计划件数"
               :disabled="
                 browseStatus || current !== before || form.warehouseStatus > 3
@@ -641,17 +641,16 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="是否质押" prop="isPledge">
+              <el-form-item label="贸易方式" prop="fTrademodeid">
                 <el-select
-                  v-model="form.isPledge"
-                  placeholder="请选择是否质押"
+                  v-model="form.fTrademodeid"
+                  placeholder="请选择贸易方式"
+                  :disabled="browseStatus || form.warehouseStatus > 3 || detailList.findIndex(function(item){return item.fBillstatus == 40}) == -1?false:true"
                   clearable
-                  :disabled="browseStatus || form.warehouseStatus > 3"
                   style="width: 80%"
-                  @change="feeUnitChange"
                 >
                   <el-option
-                    v-for="(item, index) in isPledgeOptions"
+                    v-for="(item, index) in fTrademodeidOptions"
                     :key="index.dictValue"
                     :label="item.dictLabel"
                     :value="item.dictValue"
@@ -810,16 +809,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="贸易方式" prop="fTrademodeid">
+            <el-form-item label="是否质押" prop="isPledge">
               <el-select
-                v-model="form.fTrademodeid"
-                placeholder="请选择贸易方式"
-                :disabled="browseStatus || form.warehouseStatus > 3 || detailList.findIndex(function(item){return item.fBillstatus == 40}) == -1?false:true"
+                v-model="form.isPledge"
+                placeholder="请选择是否质押"
                 clearable
+                :disabled="browseStatus || form.warehouseStatus > 3"
                 style="width: 80%"
+                @change="feeUnitChange"
               >
                 <el-option
-                  v-for="(item, index) in fTrademodeidOptions"
+                  v-for="(item, index) in isPledgeOptions"
                   :key="index.dictValue"
                   :label="item.dictLabel"
                   :value="item.dictValue"
@@ -1666,8 +1666,8 @@
             <el-col :span="6">
               <el-form-item label="计划件数" prop="fPlanqty">
                 <el-input
-                  v-input-limit="0"
-                  v-model.number="importList.fPlanqty"
+                  v-input-limit="2"
+                  v-model="importList.fPlanqty"
                   style="width: 100%"
                   placeholder="件数"
                 />
@@ -1702,8 +1702,8 @@
             <el-col :span="6">
               <el-form-item label="件数" prop="fQty">
                 <el-input
-                  v-input-limit="0"
-                  v-model.number="importList.fQty"
+                  v-input-limit="2"
+                  v-model="importList.fQty"
                   style="width: 100%"
                   placeholder="件数"
                   @input="imporComputer"
@@ -9501,7 +9501,7 @@ export default {
           this.$set(this.form, 'fContacts', this.userVal.nickName)
           this.$set(this.form, 'fIfdamage', '1')
           this.$set(this.form, 'fIfweigh', '1')
-          this.$set(this.form, 'fTrademodeid', '1')
+          this.$set(this.form, 'fTrademodeid', '3')
           this.$set(this.form, 'createTime', Date.parse(new Date()))
           this.$set(this.form, 'fBstime', Date.parse(new Date()))
           this.$set(this.form, 'fBusinessType', '0')

src/views/Warehousing/inStock/noUpload.vue

@@ -167,7 +167,7 @@
           <span v-else-if="item.label == 'fQty'">
               <el-input
                 v-input-limit="0"
-                v-model.number="scope.row.fQty"
+                v-model="scope.row.fQty"
                 style="width: 100%"
                 placeholder="件数"
                 @input="importComputer(scope.row)"
@@ -175,7 +175,7 @@
             </span>
           <span v-else-if="item.label == 'fGrossweight'">
               <el-input
-                v-model.number="scope.row.fGrossweight"
+                v-model="scope.row.fGrossweight"
                 v-input-limit="2"
                 style="width: 100%"
                 placeholder="毛重"
@@ -183,7 +183,7 @@
             </span>
           <span v-else-if="item.label == 'fNetweight'">
               <el-input
-                v-model.number="scope.row.fNetweight"
+                v-model="scope.row.fNetweight"
                 v-input-limit="2"
                 style="width: 100%"
                 placeholder="净重"

src/views/Warehousing/inStock/uploadExcel.vue

@@ -81,14 +81,14 @@
               </el-input>
             </span>
             <span v-else-if="item.label == 'fQty'">
-              <el-input v-input-limit="0" v-model.number="scope.row.fQty" style="width: 100%" placeholder="件数"/>
+              <el-input v-input-limit="0" v-model="scope.row.fQty" style="width: 100%" placeholder="件数"/>
             </span>
             <span v-else-if="item.label == 'fGrossweight'">
-              <el-input v-model.number="scope.row.fGrossweight" v-input-limit="2" style="width: 100%"
+              <el-input v-model="scope.row.fGrossweight" v-input-limit="2" style="width: 100%"
                         placeholder="毛重"/>
             </span>
             <span v-else-if="item.label == 'fNetweight'">
-              <el-input v-model.number="scope.row.fNetweight" v-input-limit="2" style="width: 100%" placeholder="净重"/>
+              <el-input v-model="scope.row.fNetweight" v-input-limit="2" style="width: 100%" placeholder="净重"/>
             </span>
             <span v-else-if="item.label == 'fPackagespecs'">
               <el-input v-model="scope.row.fPackagespecs" style="width: 100%" placeholder="包装规格" />

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -132,7 +132,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="计划件数" prop="fPlanqty">
-            <el-input v-model.number="form.fPlanqty" style="width: 80%" maxlength="9" laceholder="计划件数" :disabled="
+            <el-input v-model="form.fPlanqty" style="width: 80%" maxlength="9" laceholder="计划件数"  v-input-limit="2" :disabled="
               browseStatus || current !== before || form.warehouseStatus > 3
             " />
           </el-form-item>

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -243,7 +243,8 @@
         <el-col :span="8">
           <el-form-item label="计划调拨件数" prop="fPlanqty">
             <el-input
-              v-model.number="form.fPlanqty"
+              v-model="form.fPlanqty"
+              v-input-limit="2"
               style="width: 80%"
               maxlength="9"
               laceholder="计划件数"