Merge branch 'fix_lin' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin

src/views/valueAddedService/valueAddedConfig/index.vue

@@ -181,7 +181,12 @@ export default {
               <el-form-item label="" label-width="0px" prop={`pgIncreItems.${index}.${column.columnAttributes.prop}`} rules={required}>
                 <el-input
                   value={row[column.columnAttributes.prop]}
-                  onInput={(val) => { row[column.columnAttributes.prop] = val }}
+                  onInput={(val) => {
+                    row[column.columnAttributes.prop] = val
+                    if (val && row.workerAmount && Number(row.workerAmount) > Number(val)) {
+                      row.workerAmount = val
+                    }
+                  }}
                   placeholder="请输入内容"
                 >
                 </el-input>
@@ -199,7 +204,9 @@ export default {
               <el-form-item label="" label-width="0px" prop={`pgIncreItems.${index}.${column.columnAttributes.prop}`} rules={required}>
                 <el-input
                   value={row[column.columnAttributes.prop]}
-                  onInput={(val) => { row[column.columnAttributes.prop] = val }}
+                  onInput={(val) => {
+                    row[column.columnAttributes.prop] = val && row.amount && Number(val) > Number(row.amount) ? row.amount : val
+                  }}
                   placeholder="请输入内容"
                 >
                 </el-input>