diff --git a/src/lang/en/business/resource/gyzj.js b/src/lang/en/business/resource/gyzj.js
index e8f6259..5452a46 100644
--- a/src/lang/en/business/resource/gyzj.js
+++ b/src/lang/en/business/resource/gyzj.js
@@ -61,6 +61,7 @@ export default {
   ffr2: 'Issuer 2',
   zytj: 'Transfer Condition',
   md: '目的',
+  ckmz: 'Check-out Gross Weight',
   ckl: 'Out Amount',
   ffzytj: 'Check-out Transfer Condition',
   ghzytj: 'Check-in Transfer Condition',
diff --git a/src/lang/zh/business/resource/gyzj.js b/src/lang/zh/business/resource/gyzj.js
index a0da737..7322e24 100644
--- a/src/lang/zh/business/resource/gyzj.js
+++ b/src/lang/zh/business/resource/gyzj.js
@@ -14,6 +14,7 @@ export default {
   cctj: '存储条件',
   ccwz: '存储位置',
   cksj: '出库时间',
+  ckmz: '出库毛重',
   rksj: '入库时间',
   ckjz: '出库量',
   rkjz: '入库量',
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Bj.vue b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
index 268daa7..992599d 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
@@ -32,7 +32,9 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.sxrq')" prop="sxrq">
-              <el-input type="text" v-model="form.sxrq" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <el-date-picker style="width: 100%;" v-model="form.sxrq" type="datetime"
+                :placeholder="$t('form.placeholderSelect')" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss">
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
@@ -96,7 +98,7 @@ import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 
 export default {
   name: "Bj",
-  components: { SelectList,BusinessSelect },
+  components: { SelectList, BusinessSelect },
   data() {
     return {
       open: false,
@@ -147,7 +149,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
index 5f3cbaf..2f6273e 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
@@ -40,6 +40,14 @@
                       @change="selectStudyChangeBatch" />
                   </template>
                 </el-table-column>
+                <el-table-column :label="$t('page.business.resource.gyzj.ckmz')" align="center" width="250px">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.ckmz" maxlength="50" > <template slot="append">{{
+                      scope.row.kcdw
+                    }}</template>
+                    </el-input>
+                  </template>
+                </el-table-column>
                 <el-table-column :label="$t('form.remark')" align="center" width="250px">
                   <template slot-scope="scope">
                     <el-input type="text" v-model="scope.row.remark" maxlength="50"
@@ -115,6 +123,13 @@
                 <SelectStudy v-model="form.mdIds" @change="selectStudyChange" />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('page.business.resource.gyzj.ckmz')" prop="ckmz">
+                <el-input type="text" v-model="form.ckmz" maxlength="50" > <template slot="append">{{ form.ckldw
+                }}</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -266,6 +281,11 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
+        ckmz: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
         zytj: [{
           required: true,
           message: ' ',
@@ -324,7 +344,9 @@ export default {
           sxrq: item.sxrq,
           ccwz: item.ccwz,
           zytj: null,
+          ckmz:null,
           mdIds: null,
+          ckmz: null,
           mdMcs: null,
           mdOther: null,
           remark: null
@@ -357,6 +379,8 @@ export default {
         ffr1mm: null,
         ffr2Id: null,
         ffr2Mc: null,
+        ckmz:null,
+        ckl:null,
         ffr2mm: null,
         qmyy: this.$t('page.business.resource.gyzj.lqff'),
         qmrmm: null,
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue b/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue
index 6163f03..ae46862 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue
@@ -32,7 +32,8 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.sxrq')" prop="sxrq">
-              <el-input type="text" v-model="form.sxrq" maxlength="50" disabled />
+               <el-date-picker style="width: 100%;" v-model="form.sxrq" type="datetime" disabled >
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/study/comp/wzlb/gyzjList.vue b/src/views/business/study/comp/wzlb/gyzjList.vue
index d7b7670..75f421a 100644
--- a/src/views/business/study/comp/wzlb/gyzjList.vue
+++ b/src/views/business/study/comp/wzlb/gyzjList.vue
@@ -76,7 +76,7 @@
                   <!-- 归还 -->
                   <el-button type="text" @click="handleGh(scope.row)"
                     v-hasPermi="['business:studyGyzj:gh', 'business:nonTrialGyzj:gh', 'business:drugGyzj:gh']">{{
-                      $t('page.business.resource.gyzj.guihuan') }}</el-button>
+                      $t('page.business.resource.gyzj.sqguihuan') }}</el-button>
                 </template>
                 <template>
                   <!-- 处置药剂 -->