Merge branch 'dev' of http://39.101.143.165:8090/sxzgd/vue-insagent-pc into dev

src/components/Form/ProductCostForm.vue

@@ -154,7 +154,7 @@
                 </template>
                 <div v-if="formItems.attrType == 'select'" style="display: flex;">
                   <el-select multiple v-model="formItems.minArray" placeholder="请选择" style="width: 100%;"
-                    @change="selectChange($event, formItems.id, 'min')">
+                    @change="selectChange($event, formItems.id, 'min')" :filterable="formItems.attrName == '车辆类型' ? true : false">
                     <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
                     :value="formItems.attrName == '车辆类型' ? dict.code : dict.name"></el-option>
                   </el-select>

src/views/Task/daikeComponents/KtLetter1.vue

@@ -3652,7 +3652,7 @@
                   <div v-for="(dataItem, dataIndex) in item.tableData" :key="dataIndex">
                     <el-col :span="6">
                       份数
-                      <el-input v-model="dataItem.quantity" type="number" style="width: 120px;" size="small">
+                      <el-input v-model="dataItem.quantity" style="width: 120px;" size="small" @input="(e) => {changeInput(e,listIndex, index, 'minus',item.tableData.minQuantity)}">
                         <template slot="prepend"><i class="el-icon-minus" @click="numberChange(listIndex, index, 'minus',dataItem.minQuantity, dataIndex)"></i></template>
                         <template slot="append"><i class="el-icon-plus" @click="numberChange(listIndex, index, 'plus',dataItem.minQuantity, dataIndex)"></i></template>
                       </el-input>
@@ -3700,7 +3700,7 @@
                     <el-col :span="6" v-if="item.tableData">
                       份数
                       <!-- <el-input-number v-model="item.tableData.quantity" :step="1" :min="1" :max="10" @change="numberChange(listIndex, index)" size="small"></el-input-number> -->
-                      <el-input v-model="item.tableData.quantity" type="number" style="width: 120px;" size="small">
+                      <el-input v-model="item.tableData.quantity" style="width: 120px;" size="small" @input="(e) => {changeInput(e,listIndex, index, 'minus',item.tableData.minQuantity)}">
                         <template slot="prepend"><i class="el-icon-minus" @click="numberChange(listIndex, index, 'minus',item.tableData.minQuantity)"></i></template>
                         <template slot="append"><i class="el-icon-plus" @click="numberChange(listIndex, index, 'plus',item.tableData.minQuantity)"></i></template>
                       </el-input>
@@ -3720,7 +3720,7 @@
                     <el-col :span="6" v-if="item.tableData">
                       份数
                       <!-- <el-input-number v-model="item.tableData.quantity" :step="1" :min="1" :max="10" @change="numberChange(listIndex, index)" label="描述文字" size="small"></el-input-number> -->
-                      <el-input v-model="item.tableData.quantity" type="number" style="width: 120px;" size="small">
+                      <el-input v-model="item.tableData.quantity" style="width: 120px;" size="small" @input="(e) => {changeInput(e,listIndex, index, 'minus',item.tableData.minQuantity)}">
                         <template slot="prepend"><i class="el-icon-minus" @click="numberChange(listIndex, index, 'minus',item.tableData.minQuantity)"></i></template>
                         <template slot="append"><i class="el-icon-plus" @click="numberChange(listIndex, index, 'plus',item.tableData.minQuantity)"></i></template>
                       </el-input>
@@ -3839,7 +3839,7 @@
                     <el-col :span="6" v-if="item.tableData">
                       份数
                       <!-- <el-input-number v-model="item.tableData.quantity" :step="1" :min="1" :max="10" @change="numberChange(listIndex, index)" size="small"></el-input-number> -->
-                      <el-input v-model="item.tableData.quantity" type="number" style="width: 120px;" size="small">
+                      <el-input v-model="item.tableData.quantity" style="width: 120px;" size="small" @input="(e) => {changeInput(e,listIndex, index, 'minus',item.tableData.minQuantity)}">
                         <template slot="prepend"><i class="el-icon-minus" @click="numberChange(listIndex, index, 'minus',item.tableData.minQuantity)"></i></template>
                         <template slot="append"><i class="el-icon-plus" @click="numberChange(listIndex, index, 'plus',item.tableData.minQuantity)"></i></template>
                       </el-input>
@@ -3859,7 +3859,7 @@
                     <el-col :span="9" v-if="item.tableData">
                       份数
                       <!-- <el-input-number v-model="item.tableData.quantity" :step="1" :min="1" :max="10" @change="numberChange(listIndex, index)" label="描述文字" size="small"></el-input-number> -->
-                      <el-input v-model="item.tableData.quantity" type="number" style="width: 120px;" size="small">
+                      <el-input v-model="item.tableData.quantity" style="width: 120px;" size="small" @input="(e) => {changeInput(e,listIndex, index, 'minus',item.tableData.minQuantity)}">
                         <template slot="prepend"><i class="el-icon-minus" @click="numberChange(listIndex, index, 'minus',item.tableData.minQuantity)"></i></template>
                         <template slot="append"><i class="el-icon-plus" @click="numberChange(listIndex, index, 'plus',item.tableData.minQuantity)"></i></template>
                       </el-input>
@@ -6083,9 +6083,9 @@ export default {
     numberChange(listIndex, index, type,minquantity, dataIndex) {
       if (dataIndex >= 0) {
         if (type == 'plus') {
-          if (this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData[dataIndex].quantity < 100) {
-            this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData[dataIndex].quantity += 1
-          }
+          // if (this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData[dataIndex].quantity < 100) {
+            this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData[dataIndex].quantity ++
+          // }
         } else {
           if (this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData[dataIndex].quantity > minquantity) {
             this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData[dataIndex].quantity -= 1
@@ -6093,9 +6093,9 @@ export default {
         }
       } else {
         if (type == 'plus') {
-          if (this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData.quantity < 100) {
-            this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData.quantity += 1
-          }
+          // if (this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData.quantity < 100) {
+            this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData.quantity ++
+          // }
         } else {
           if (this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData.quantity > minquantity) {
             this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData.quantity -= 1
@@ -6113,6 +6113,15 @@ export default {
         }
       })
     },
+    changeInput(e,listIndex, index, type,minquantity, dataIndex) {
+      let num = Number(e)
+      if (dataIndex >= 0) {
+        this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData[dataIndex].quantity = num
+      } else {
+        this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData.quantity = num
+      }
+      this.$forceUpdate()
+    },
     // 选中驾意
     handleChangeSelect(index) {
       if (this.totalCompanyList[this.typeDialogIndex].cnName == 'zijin') {
@@ -13220,6 +13229,7 @@ export default {
     vertical-align: baseline;
     border-color: #D42426;
     background: #D42426;
+    color: #FFF;
   }
   .pinganTable .el-table__header-wrapper .el-checkbox {
     display: none;