Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2

6 months ago · d81aac02a2
parent 9d0aab21c9 33b3d5bdc2
commit d81aac02a2
4 changed files with 13 additions and 13 deletions
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/subjectbasic/SubjectbasicConstant.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/subjectbasic/SubjectbasicConstant.java
--- a/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/form.vue
@ -497,7 +497,7 @@
          <el-col :span="8" v-if="judgeShow('paymentMethod')">
            <jnpf-form-tip-item label="付款方式" v-if="judgeShow('paymentMethod')" prop="paymentMethod">
              <JnpfSelect v-model="dataForm.paymentMethod" @change="changeData('paymentMethod', -1)" placeholder="请选择"
-                :disabled="judgeWrite('paymentMethod')" clearable :style='{ "width": "100%" }' :multiple="true"
+                :disabled="judgeWrite('paymentMethod')" clearable :style='{ "width": "100%" }'
                :options="paymentMethodOptions" :props="paymentMethodProps">
              </JnpfSelect>
            </jnpf-form-tip-item>
--- a/jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/form.vue
@ -483,7 +483,7 @@
          <el-col :span="8" v-if="judgeShow('paymentMethod')">
            <jnpf-form-tip-item label="付款方式" v-if="judgeShow('paymentMethod')" prop="paymentMethod">
              <JnpfSelect v-model="dataForm.paymentMethod" @change="changeData('paymentMethod',-1)" placeholder="请选择"
-                :disabled="judgeWrite('paymentMethod')" clearable :style='{"width":"100%"}' :multiple="true"
+                :disabled="judgeWrite('paymentMethod')" clearable :style='{"width":"100%"}'
                :options="paymentMethodOptions" :props="paymentMethodProps">
              </JnpfSelect>
            </jnpf-form-tip-item>
--- a/jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/form.vue
@ -483,7 +483,7 @@
          <el-col :span="8" v-if="judgeShow('paymentMethod')">
            <jnpf-form-tip-item label="付款方式" v-if="judgeShow('paymentMethod')" prop="paymentMethod">
              <JnpfSelect v-model="dataForm.paymentMethod" @change="changeData('paymentMethod',-1)" placeholder="请选择"
-                :disabled="judgeWrite('paymentMethod')" clearable :style='{"width":"100%"}' :multiple="true"
+                :disabled="judgeWrite('paymentMethod')" clearable :style='{"width":"100%"}'
                :options="paymentMethodOptions" :props="paymentMethodProps">
              </JnpfSelect>
            </jnpf-form-tip-item>