|  | @@ -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: "备注",
 |