Browse Source

轮胎采购

caojunjie 1 year ago
parent
commit
7acacbdb9b

+ 26 - 18
src/views/tirePartsMall/basicData/commodityInformation/detailsPage.vue

@@ -45,17 +45,21 @@
                             inactive-text="否" active-value="1" inactive-value="0" />
                     </template>
                     <template slot="explosionProof" slot-scope="{disabled}">
-                        <el-switch v-model="form.explosionProof" :disabled="disabled" active-text="是" inactive-text="否"
-                            active-value="1" inactive-value="0" />
+                        <!--<el-switch v-model="form.explosionProof" :disabled="disabled" active-text="是" inactive-text="否"-->
+                        <!--    active-value="1" inactive-value="0" />-->
+                        <!--<el-radio v-model="form.explosionProof"></el-radio>-->
+                        <el-checkbox v-model="form.explosionProof" :checked="form.explosionProof == 1" :true-label="1" :false-label="0"></el-checkbox>
                     </template>
 
                     <template slot="originalFactory" slot-scope="{disabled}">
-                        <el-switch v-model="form.originalFactory" :disabled="disabled" active-text="是" inactive-text="否"
-                                   active-value="1" inactive-value="0" />
+                        <!--<el-switch v-model="form.originalFactory" :disabled="disabled" active-text="是" inactive-text="否"-->
+                        <!--           active-value="1" inactive-value="0" />-->
+                        <el-checkbox v-model="form.originalFactory" :checked="form.originalFactory == 1" :true-label="1" :false-label="0"></el-checkbox>
                     </template>
                     <template slot="selfRecovery" slot-scope="{disabled}">
-                        <el-switch v-model="form.selfRecovery" :disabled="disabled" active-text="是" inactive-text="否"
-                                   active-value="1" inactive-value="0" />
+                        <!--<el-switch v-model="form.selfRecovery" :disabled="disabled" active-text="是" inactive-text="否"-->
+                        <!--           active-value="1" inactive-value="0" />-->
+                        <el-checkbox v-model="form.selfRecovery" :checked="form.selfRecovery == 1" :true-label="1" :false-label="0"></el-checkbox>
                     </template>
                 </avue-form>
             </trade-card>
@@ -395,15 +399,9 @@ export default {
                     //   }]
                     // },
                     {
-                        label: "是否管理批次号",
-                        prop: "whether",
-                        labelWidth: 120,
-                        span: 8,
-                        rules: [{
-                            required: true,
-                            message: " ",
-                            trigger: "blur"
-                        }]
+                        label: "配套标记",
+                        prop: "matchedMarkings",
+                        span: 8
                     },
                     {
                         label: "库存预警",
@@ -413,7 +411,7 @@ export default {
                     {
                         label: "防爆",
                         prop: "explosionProof",
-                        span: 8,
+                        span: 2,
                         type: 'select',
                         dicData: [{
                             label: '否',
@@ -426,7 +424,7 @@ export default {
                     {
                         label: "静音棉",
                         prop: "originalFactory",
-                        span: 8,
+                        span: 2,
                         type: 'select',
                         dicData: [{
                             label: '否',
@@ -439,7 +437,7 @@ export default {
                     {
                         label: "自修补",
                         prop: "selfRecovery",
-                        span: 8,
+                        span: 2,
                         type: 'select',
                         dicData: [{
                             label: '否',
@@ -448,6 +446,16 @@ export default {
                             label: '是',
                             value: 1
                         }],
+                    },{
+                        label: "是否管理批次号",
+                        prop: "whether",
+                        labelWidth: 120,
+                        span: 8,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: "备注",

+ 6 - 2
src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -50,7 +50,7 @@
                 <avue-form :option="optionForm" v-model="form" ref="form">
                     <template slot-scope="{row,index}" slot="contacts">
                         <!-- 联系人 -->
-                        <el-select v-model="form.contacts" placeholder="请选择" size="small" style="width:60%" filterable
+                        <el-select v-model="form.contacts" placeholder="请选择" size="small" style="width:60%" filterable allow-create default-first-option
                             @change="contactsChange($event)" :disabled=isContacts>
                             <el-option v-for="item in contactsOption" :key="item.cname" :label="item.cname"
                                 :value="item.contacts" />
@@ -58,7 +58,7 @@
                     </template>
                     <template slot-scope="{row,index}" slot="recAddress">
                         <!-- 地址 -->
-                        <el-select v-model="form.recAddress" placeholder="请选择" size="small" style="width:60%" filterable
+                        <el-select v-model="form.recAddress" placeholder="请选择" size="small" style="width:60%" filterable allow-create default-first-option
                             :disabled=isContacts>
                             <el-option v-for="item in recAddressOption" :key="item.id"
                                 :label="item.belongtoarea + item.detailedAddress"
@@ -521,6 +521,8 @@ export default {
                     type: "select",
                     prop: "contacts",
                     disabled: false,
+                   allowCreate:true,
+                   filterable:true,
                     props: {
                         label: 'address',
                         value: 'id'
@@ -535,6 +537,8 @@ export default {
                     label: '地址',
                     prop: "recAddress",
                     type: 'select',
+                        allowCreate:true,
+                        filterable: true,
                     disabled: false,
                     props: {
                         label: 'address',