Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

jyy

2021-06-09 ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c

 zq-erp/src/main/resources/templates/views/admin/hive/store/outStore-form.html

@@ -233,7 +233,7 @@
                        <el-table-column
                              label="数量">
                           <template slot-scope="scope">
                              <el-form-item :prop="'assembleGoods.'+ scope.$index +'.amount'" :rules="rules.count">
                              <el-form-item :prop="'assembleGoods.'+ scope.$index +'.amount'" >
                                 <el-input v-model.number="scope.row.amount"></el-input>
                              </el-form-item>
                           </template>
@@ -279,10 +279,6 @@
            ],
            warehouseData : [
               { required: true, message: '请选择仓库', trigger: 'change' }
            ],
            count : [
               { required: true, message: '请输入信息', trigger: 'blur' },
               { type : 'number', message: '请输入数字', trigger: 'blur' }
            ],
         },
         outStoreTypeData : [],