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

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -10,7 +10,7 @@
             <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
             </el-option>
           </el-select>
-          <el-checkbox v-model="checked" @change="allowEdit" :disabled="warehouseList.length==0">允许手动编辑重量</el-checkbox>
+          <el-checkbox v-hasPermission=" `acquisitionManagement.acquisition.allow`" v-model="checked" @change="allowEdit" :disabled="warehouseList.length==0">允许手动编辑重量</el-checkbox>
         </div>
       </template>
     </BaseHeaderLayout>

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -713,13 +713,12 @@
           }
           return false
         }
-        
-        if (this.baseInfoForm.waterBase>this.baseInfoForm.waterMax) {
+        if (Number(this.baseInfoForm.waterBase)>Number(this.baseInfoForm.waterMax)) {
             this.$message.error('基准水分须小于水分上限！')
           return false
         }
         
-        if (this.baseInfoForm.waterMin>this.baseInfoForm.waterBase) {
+        if (Number(this.baseInfoForm.waterMin)>Number(this.baseInfoForm.waterBase)) {
             this.$message.error('干粮水分须小于基准水分！')
           return false
         }

src/views/platformaudit/grainPulseDynamic.vue

@@ -82,21 +82,21 @@
           <!-- class="record"
            class="record" -->
           <template slot-scope="scope">
-            <el-button
-              size="medium"
-              type="danger"
+            <div
+              class="record"
               v-if="scope.row.statusFlag == 1"
               @click="rejectList(scope.row)"
-              >驳回</el-button
             >
-            <el-button
-              size="medium"
-              type="primary"
-              v-if="scope.row.statusFlag == 1"
+              驳回
+            </div>
+            <div
+              class="record"
+               v-if="scope.row.statusFlag == 1"
               @click="adoptList(scope.row)"
               v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
-              >通过</el-button
             >
+              通过
+            </div>
             <template
               v-else
               v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
@@ -145,8 +145,8 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <span v-if="SettledCompanyDynamicsList.statusFlag == '1'">
-          <el-button @click="reject(id)" type="danger">驳回</el-button>
-          <el-button @click="adopt(id)" type="primary">通过</el-button>
+          <el-button @click="reject(id)" >驳回</el-button>
+          <el-button @click="adopt(id)" >通过</el-button>
         </span>
         <span v-else-if="SettledCompanyDynamicsList.statusFlag != '1'"
           ><el-button @click="dialogFormVisible = fase">关闭</el-button>