diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index bbd8a641..f109559d 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -40,12 +40,12 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
   // tag: 本地
   // axios.defaults.baseURL = 'http://192.168.34.174:6023/'  // 老大本地
-  axios.defaults.baseURL = 'http://192.168.34.116:6023/' // 邱平毅本地
+  // axios.defaults.baseURL = 'http://192.168.34.116:6023/' // 邱平毅本地
   // axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc'  // 邱平毅vpn本地
   // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
   // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
-  // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
+  axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
   // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
   // axios.defaults.baseURL = 'http://47.97.202.104:6023/';
   // axios.defaults.baseURL = 'http://139.9.66.234:8/';
diff --git a/src/views/projectFront/materialManage/materialWeightList.vue b/src/views/projectFront/materialManage/materialWeightList.vue
index 5f344382..5cd59643 100644
--- a/src/views/projectFront/materialManage/materialWeightList.vue
+++ b/src/views/projectFront/materialManage/materialWeightList.vue
@@ -279,7 +279,7 @@
           <el-form-item
             :label="$t('message.energyManage.material.giveCompany')"
             prop="issuingEnterpriseId"
-            v-if="addEditForm.poundType != 2"
+            v-if="addEditForm.poundType == 2"
             :rules="{
               required: true,
               message: $t('message.companyDiagram.Mandatory'),
@@ -303,7 +303,7 @@
           <el-form-item
             :label="$t('message.energyManage.material.takeBackCompany')"
             prop="receivingEnterpriseId"
-            v-if="addEditForm.poundType != 1"
+            v-if="addEditForm.poundType == 1"
             :rules="{
               required: true,
               message: $t('message.companyDiagram.Mandatory'),
@@ -323,7 +323,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item :label="$t('message.energyManage.material.weighingSkinTime')" prop="weighingGrossTime">
+          <el-form-item :label="$t('message.energyManage.material.weighingGrossTime')" prop="weighingGrossTime">
             <el-date-picker
               v-model="addEditForm.weighingGrossTime"
               type="datetime"
@@ -343,22 +343,24 @@
           </el-form-item>
           <el-form-item :label="$t('message.energyManage.material.grossWeight')" prop="grossWeight">
             <el-input
+              onkeyup="value=value.replace(/[^\d]/g,'')"
               v-model="addEditForm.grossWeight"
-              @input="listenerValue2"
+              @blur="listenerValue2"
               :placeholder="$t('message.deviceManage.placeholder')"
             ></el-input>
           </el-form-item>
           <el-form-item :label="$t('message.energyManage.material.tare')" prop="tare">
             <el-input
+              onkeyup="value=value.replace(/[^\d]/g,'')"
               v-model="addEditForm.tare"
-              @input="listenerValue2"
+              @blur="listenerValue2"
               :placeholder="$t('message.deviceManage.placeholder')"
             ></el-input>
           </el-form-item>
           <el-form-item :label="$t('message.energyManage.material.weight')">
             <el-input
               disabled
-              :value="addEditForm.grossWeight - addEditForm.tare"
+              :value="afterVal"
             ></el-input>
           </el-form-item>
           <el-form-item :label="$t('message.energyManage.material.originReceiptNumber')" prop="originalBillNumber">
@@ -416,7 +418,10 @@
           <div class="fixedDataBox">
             <div class="item">{{$t('message.energyManage.material.transportWeight')+':'}}{{ fixedData.value1 }}{{$t('message.energyManage.material.weight3')}}</div>
             <div class="item">{{$t('message.energyManage.material.trueWeight')+':'}}{{ fixedData.value2 }}{{$t('message.energyManage.material.weight3')}}</div>
-            <div class="item">{{$t('message.energyManage.material.realNum')+':'}}{{ fixedData.value3 }}{{fixedData.computeUnit}}</div>
+            <div class="item">{{$t('message.energyManage.material.realNum')+':'}}
+              {{ fixedData.value3 }}{{fixedData.deviationType!='' ? fixedData.computeUnit : ''}}
+            </div>
+            <!-- 单位 -->
           </div>
           <div class="fixedDataBox">
             <div class="item">{{$t('message.energyManage.material.realDeviation')+':'}}{{ fixedData.value4 }}{{fixedData.deviationType==1?'%':'吨'}}</div>
@@ -557,6 +562,7 @@ export default {
   },
   data() {
     return {
+      afterVal:'',
       addEditRules: {
         carNumber: [
           {
@@ -737,6 +743,7 @@ export default {
       this.allMaterialList.forEach((element) => {
         if (element.id == this.addEditForm.materialId) {
           let unit =element.deviationType==1?'%':'吨'
+          console.log('单位',  element.computeUnit)
           this.fixedData.computeUnit = element.computeUnit;
           this.fixedData.value5 =
             element.adjustStartValue +unit+ " ~ " + element.adjustEndValue+unit;
@@ -791,11 +798,12 @@ export default {
     listenerValue2(type) {
       //type 有值代表在输入扣量，为1代表在输入扣量百分比，为2代表在输入扣量值
       if (this.addEditForm.grossWeight == "") {
-        this.addEditForm.grossWeight = 0;
+        this.addEditForm.grossWeight = '';
       }
       if (this.addEditForm.tare == "") {
-        this.addEditForm.tare = 0;
+        this.addEditForm.tare = '';
       }
+      this.afterVal = this.addEditForm.grossWeight - this.addEditForm.tare;
       //计算净重
       let jing = this.addEditForm.grossWeight - this.addEditForm.tare;
       if (type == 1) {
@@ -806,7 +814,9 @@ export default {
           (this.addEditForm.deductionNum / jing) * 100;
       }
       this.fixedData.value2 = jing - this.addEditForm.deductionNum;
-      this.fixedData.value3 = this.fixedData.value2 / this.addEditForm.scaleFactor;
+      if(this.fixedData.value2 != '' && this.addEditForm.scaleFactor != '' && this.fixedData.value2 != 0 && this.addEditForm.scaleFactor != 0){
+        this.fixedData.value3 = this.fixedData.value2 / this.addEditForm.scaleFactor;
+      }
       this.fixedData.value4 = this.fixedData.value2 - this.fixedData.value1;
       this.computeDeviationResult()
     },