Sfoglia il codice sorgente

1.新增判断订单行不能为空
2.解决查询条件中参照无数据问题

002390 2 anni fa
parent
commit
46e765f48d

+ 8 - 0
src/views/purchase/purchase-order/add/index.vue

@@ -232,6 +232,12 @@ export default {
 
       this.$refs['orderAddForm'].validate(async (valid) => {
         if (valid) {
+
+          if(!this.params['puOrderItemList'].length || !this.params['puOrderExecuteList'].length){
+
+            this.$message.error('请填写订单行!');
+            return false;
+          }
           try {
             const { code, msg } = await orderApi.create(this.params);
             if (code === 200) {
@@ -490,6 +496,7 @@ export default {
               <el-checkbox
                 v-if="column.inputType === 'Checkbox'"
                 v-model="params[column.key]"
+                :disabled="column.disabled"
                 true-label="Y"
                 false-label="N"
               ></el-checkbox>
@@ -596,6 +603,7 @@ export default {
                     <el-checkbox
                       v-if="cColumn.inputType === 'Checkbox'"
                       v-model="scope.row[cColumn.key]"
+                      :disabled="cColumn.disabled"
                       true-label="Y"
                       false-label="N"
                     ></el-checkbox>

+ 6 - 1
src/views/purchase/purchase-order/edit/index.vue

@@ -103,7 +103,7 @@ export default {
 
         // if (Array.isArray(this.params[key])) {
         if (key === 'puOrderItemList' || key === 'puOrderExecuteList') {
-          
+
           const arr = this.tabColumns.find(
 
             (element) => element['key'] === key
@@ -163,6 +163,11 @@ export default {
     async handleSava() {
       this.$refs['orderEditForm'].validate(async (valid) => {
         if (valid) {
+          if(!this.params['puOrderItemList'].length || !this.params['puOrderExecuteList'].length){
+
+            this.$message.error('请填写订单行!');
+            return false;
+          }
           try {
             this.loading = true;
             const { code, msg } = await (this.handleIsRevise(this.params.status) ?

+ 1 - 1
src/views/purchase/purchase-order/index.vue

@@ -348,7 +348,7 @@ export default {
                   :value-key="column.valueKey"
                   :placeholder="column.placeholder"
                   :data-mapping="column.dataMapping"
-                  :query-params="column.queryParams(params)"
+                  :query-params="column.queryParams"
                 ></dr-popover-select>
                 <!-- @keyup.enter.native="useQuery(params, page)" -->