Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/contractManagement/purchaseContractCost.vue

@@ -135,8 +135,8 @@
       <el-form style='margin:0 auto;' ref="form" :model="deptBudgetList" label-width="100px">
         <el-form-item v-if='status==1||status==2||status==5' label="类型">
           <el-radio-group v-model="costType">
-            <el-radio :label="1">粮款</el-radio>
-            <el-radio :label="2">非粮款</el-radio>
+            <el-radio :label="'1'">粮款</el-radio>
+            <el-radio :label="'2'">非粮款</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item v-else label="类型">

src/views/houseSelfCollect/weighingManagement.vue

@@ -127,10 +127,10 @@
       <div class="print-type-content">
         <div class="print-type-title">请选择打印纸张类型</div>
         <div class="print-type-checkbox">
-          <!-- <el-radio-group v-model="radio">
+          <el-radio-group v-model="radio">
             <el-radio label="A4" class="label-width" @change="selectType">A4</el-radio>
             <el-radio label="A5" class="label-width" @change="selectType">A5</el-radio>
-          </el-radio-group> -->
+          </el-radio-group>
         </div>
 
         <div class="shdw-style" v-if="checked||(!ddchecked&&!checked)">