Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/api/business/gyzj/gyzj.js

@@ -237,4 +237,22 @@ export function jd(data) {
     method: 'post',
     data: data
   })
+}
+
+//存储
+export function cc(data) {
+  return request({
+    url: '/system/business/gyzj/cc',
+    method: 'post',
+    data: data
+  })
+}
+
+//取出
+export function qc(data) {
+  return request({
+    url: '/system/business/gyzj/qc',
+    method: 'post',
+    data: data
+  })
 }

src/api/business/mjy/mjy.js

@@ -224,4 +224,23 @@ export function jd(data) {
     method: 'post',
     data: data
   })
+}
+
+
+//存储
+export function cc(data) {
+  return request({
+    url: '/system/business/mjy/cc',
+    method: 'post',
+    data: data
+  })
+}
+
+//取出
+export function qc(data) {
+  return request({
+    url: '/system/business/mjy/qc',
+    method: 'post',
+    data: data
+  })
 }

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',
@@ -120,5 +121,8 @@ export default {
   xgkc: 'Change Inventory',
   bcsm: 'Additional Remark',
   jsffjl: '解锁发放记录',
-  sdffjl: '锁定发放记录'
+  sdffjl: '锁定发放记录',
+  quchu: 'Take Out',
+  cunchu: 'Storage',
+  sfcc:'是否存储'
 }

src/lang/en/business/resource/mjy.js

@@ -121,5 +121,8 @@ export default {
   xgkc:'Change Inventory',
   bcsm:'Additional Remark',
   jsffjl:'解锁发放记录',
-  sdffjl:'锁定发放记录'
+  sdffjl:'锁定发放记录',
+  quchu: 'Take Out',
+  cunchu: 'Storage',
+  sfcc:'是否存储'
 }

src/lang/en/business/resource/resource.js

@@ -20,4 +20,8 @@ export default {
     gd: 'Archived',
     djd: 'Pending De-archiving'
   },
+  cczt: {
+    cc: 'Storage',
+    qc: 'Take Out',
+  },
 }

src/lang/zh/business/resource/gyzj.js

@@ -14,6 +14,7 @@ export default {
   cctj: '存储条件',
   ccwz: '存储位置',
   cksj: '出库时间',
+  ckmz: '出库毛重',
   rksj: '入库时间',
   ckjz: '出库量',
   rkjz: '入库量',
@@ -120,5 +121,8 @@ export default {
   xgkc: '修改库存',
   bcsm: '补充说明',
   jsffjl: '解锁发放记录',
-  sdffjl: '锁定发放记录'
+  sdffjl: '锁定发放记录',
+  quchu: '取出',
+  cunchu: '存储',
+  sfcc:'是否存储'
 }

src/lang/zh/business/resource/mjy.js

@@ -122,5 +122,8 @@ export default {
   xgkc:'修改库存',
   bcsm:'补充说明',
   jsffjl:'解锁发放记录',
-  sdffjl:'锁定发放记录'
+  sdffjl:'锁定发放记录',
+  quchu: '取出',
+  cunchu: '存储',
+  sfcc:'是否存储'
 }

src/lang/zh/business/resource/resource.js

@@ -20,4 +20,8 @@ export default {
     gd: '归档',
     djd: '待解档'
   },
+  cczt: {
+    cc: '存储',
+    qc: '取出',
+  },
 }

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() {

src/views/business/resource/gyzj/comps/gyzj/Cc.vue

@@ -0,0 +1,186 @@
+<template>
+  <div>
+    <!-- 存储弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.cunchu')" :visible.sync="open" width="800px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.mc')">
+              <el-input type="text" v-model="form.mc" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.bh')">
+              <el-input type="text" v-model="form.bh" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+          <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.cctj')" prop="cctj">
+              <BusinessSelect v-model="form.cctj" dictType="business_cctj"></BusinessSelect>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.ccwz')" prop="ccwz">
+              <BusinessSelect v-model="form.ccwz" dictType="business_ccwz"></BusinessSelect>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.qmr1Id')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.qmr1Id') + $t('form.password')" prop="qmr1mm">
+              <el-input type="password" v-model="form.qmr1mm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.qmr2Id')" prop="qmr2Id">
+              <SelectDeptUser v-model="form.qmr2Id" key="qmr2Id" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.qmr2Id') + $t('form.password')" prop="qmr2mm">
+              <el-input type="password" v-model="form.qmr2mm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.qmyyMc" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { cc } from "@/api/business/gyzj/gyzj"
+import { mapGetters } from 'vuex'
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
+
+export default {
+  name: "Cc",
+  components: { SelectDeptUser, BusinessSelect },
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        ccwz: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        cctj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr1Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr1mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr2Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr2mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName', 'name'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        cctj: '',
+        mc:'',
+        bh:'',
+        remark: '',
+        qmr1Id: '',
+        qmr1mm: '',
+        qmr2Id: '',
+        qmr2mm: '',
+        remark: '',
+        ccwz: '',
+        qmyyMc: this.$t('page.business.resource.gyzj.cunchu'),
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.resourceId
+      this.form.bh = row.bh
+      this.form.mc = row.mc
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          cc(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>

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,

src/views/business/resource/gyzj/comps/gyzj/Qc.vue

@@ -0,0 +1,160 @@
+<template>
+  <div>
+    <!-- 取出弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.quchu')" :visible.sync="open" width="800px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.mc')">
+              <el-input type="text" v-model="form.mc" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.bh')">
+              <el-input type="text" v-model="form.bh" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.qmr1Id')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.qmr1Id') + $t('form.password')" prop="qmr1mm">
+              <el-input type="password" v-model="form.qmr1mm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.qmr2Id')" prop="qmr2Id">
+              <SelectDeptUser v-model="form.qmr2Id" key="qmr2Id" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.qmr2Id') + $t('form.password')" prop="qmr2mm">
+              <el-input type="password" v-model="form.qmr2mm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.qmyyMc" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { qc } from "@/api/business/gyzj/gyzj"
+import { mapGetters } from 'vuex'
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
+
+export default {
+  name: "Qc",
+  components: { SelectDeptUser, BusinessSelect },
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmr1Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr1mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr2Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr2mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName', 'name'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        mc:'',
+        bh:'',
+        remark: '',
+        qmr1Id: '',
+        qmr1mm: '',
+        qmr2Id: '',
+        qmr2mm: '',
+        remark: '',
+        qmyyMc: this.$t('page.business.resource.gyzj.quchu'),
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.resourceId
+      this.form.bh = row.bh
+      this.form.mc = row.mc
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          qc(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>

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>

src/views/business/resource/gyzj/comps/gyzj/Xq.vue

@@ -197,7 +197,7 @@ export default {
   methods: {
    exportExcel() {
       this.$modal.loading()
-      exportDetail({ id: this.form.id }).then(response => {
+      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0] }).then(response => {
         window.open(this.baseUrl +response.msg)
         this.$modal.closeLoading()
       }).finally(() => {

src/views/business/resource/mjy/comps/mjy/Bj.vue

@@ -32,7 +32,9 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.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>

src/views/business/resource/mjy/comps/mjy/Cc.vue

@@ -0,0 +1,185 @@
+<template>
+  <div>
+    <!-- 存储弹窗 -->
+    <el-dialog :title="$t('page.business.resource.mjy.cunchu')" :visible.sync="open" width="800px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.mc')">
+              <el-input type="text" v-model="form.mc" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.bh')">
+              <el-input type="text" v-model="form.bh" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.cctj')" prop="cctj">
+              <BusinessSelect v-model="form.cctj" dictType="business_cctj"></BusinessSelect>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.ccwz')" prop="ccwz">
+              <BusinessSelect v-model="form.ccwz" dictType="business_ccwz"></BusinessSelect>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.qmr1Id')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.qmr1Id') + $t('form.password')" prop="qmr1mm">
+              <el-input type="password" v-model="form.qmr1mm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.qmr2Id')" prop="qmr2Id">
+              <SelectDeptUser v-model="form.qmr2Id" key="qmr2Id" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.qmr2Id') + $t('form.password')" prop="qmr2mm">
+              <el-input type="password" v-model="form.qmr2mm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.qmyyMc" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { cc} from "@/api/business/mjy/mjy"
+import { mapGetters } from 'vuex'
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
+
+export default {
+  name: "Cc",
+  components: { SelectDeptUser, BusinessSelect },
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        ccwz: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        cctj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr1Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr1mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr2Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr2mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName', 'name'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id:null,
+        mc:'',
+        bh:'',
+        cctj:'',
+        remark:'',
+        qmr1Id:'',
+        qmr1mm:'',
+        qmr2Id:'',
+        qmr2mm:'',
+        remark:'',
+        ccwz:'',
+        qmyyMc: this.$t('page.business.resource.mjy.cunchu'),
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.resourceId
+      this.form.bh = row.bh
+      this.form.mc = row.mc
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          cc(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>

src/views/business/resource/mjy/comps/mjy/Czyj.vue

@@ -63,10 +63,10 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.mjy.czl')" prop="czl">
-                <el-input-number type="text" v-model="form.czl" maxlength="50"
-                  :placeholder="$t('form.placeholderInput')">
-                  <template slot="append">{{ form.kcdw }}</template>
-                </el-input-number>
+                 <el-input type="text" v-model="form.czl" maxlength="50"
+                      :placeholder="$t('form.placeholderInput')"> <template slot="append">{{ form.kcdw
+                        }}</template>
+                    </el-input>
               </el-form-item>
             </el-col>
           </el-row>

src/views/business/resource/mjy/comps/mjy/Qc.vue

@@ -0,0 +1,161 @@
+<template>
+  <div>
+    <!-- 取出弹窗 -->
+    <el-dialog :title="$t('page.business.resource.mjy.quchu')" :visible.sync="open" width="800px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.mc')">
+              <el-input type="text" v-model="form.mc" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.bh')">
+              <el-input type="text" v-model="form.bh" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+       
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.qmr1Id')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.qmr1Id') + $t('form.password')" prop="qmr1mm">
+              <el-input type="password" v-model="form.qmr1mm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.qmr2Id')" prop="qmr2Id">
+              <SelectDeptUser v-model="form.qmr2Id" key="qmr2Id" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.qmr2Id') + $t('form.password')" prop="qmr2mm">
+              <el-input type="password" v-model="form.qmr2mm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.qmyyMc" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { qc } from "@/api/business/mjy/mjy"
+import { mapGetters } from 'vuex'
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
+
+export default {
+  name: "Qc",
+  components: { SelectDeptUser, BusinessSelect },
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmr1Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr1mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr2Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmr2mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName', 'name'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id:null,
+        mc:'',
+        bh:'',
+        remark:'',
+        qmr1Id:'',
+        qmr1mm:'',
+        qmr2Id:'',
+        qmr2mm:'',
+        remark:'',
+        qmyyMc: this.$t('page.business.resource.mjy.quchu'),
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.resourceId
+      this.form.bh = row.bh
+      this.form.mc = row.mc
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          qc(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>

src/views/business/resource/mjy/comps/mjy/Xq.vue

@@ -196,7 +196,7 @@ export default {
   methods: {
     exportExcel() {
       this.$modal.loading()
-      exportDetail({ id: this.form.id }).then(response => {
+      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0]  }).then(response => {
         window.open(this.baseUrl +response.msg)
         this.$modal.closeLoading()
       }).finally(() => {

src/views/business/study/comp/wzlb/gyzjList.vue

@@ -53,6 +53,12 @@
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.resource.gyzj.sxrq')" align="center" prop="sxrq" width="150px" />
+             <el-table-column :label="$t('page.business.resource.gyzj.sfcc')" align="center" width="100px" fixed="right">
+            <template slot-scope="scope">
+              <span v-if="scope.row.cczt == 1">{{ $t('page.business.resource.resource.cczt.qc') }}</span>
+              <span v-if="scope.row.cczt == 3">{{ $t('page.business.resource.resource.cczt.cc') }}</span>
+            </template>
+          </el-table-column>
           <el-table-column :label="$t('page.business.resource.gyzj.zjzt')" align="center" width="100px" fixed="right">
             <template slot-scope="scope">
               <span v-if="scope.row.zjzt == 1">{{ $t('page.business.resource.resource.zjzt.rk') }}</span>
@@ -64,6 +70,7 @@
               <span v-if="scope.row.zjzt == 11">{{ $t('page.business.resource.resource.zjzt.djd') }}</span>
             </template>
           </el-table-column>
+        
           <el-table-column :label="$t('form.operate')" fixed="right" align="center"
             class-name="small-padding fixed-width" width="250px">
             <template slot-scope="scope">
@@ -71,12 +78,12 @@
               <el-button type="text" @click="handleXq(scope.row)"
                 v-hasPermi="['business:studyGyzj:xq', 'business:nonTrialGyzj:xq', 'business:drugGyzj:xq']">{{
                   $t('page.business.resource.gyzj.detail') }}</el-button>
-              <template v-if="scope.row.syghzt == 1&&scope.row.zjzt==3">
+              <template v-if="scope.row.zjzt==3&&scope.row.cczt==1">
                 <template v-if="scope.row.ghzt == 1">
                   <!-- 归还 -->
                   <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>
                   <!-- 处置药剂 -->
@@ -97,6 +104,14 @@
               <el-button type="text" v-if="scope.row.zjzt==2&&scope.row.rksqzt==1" @click="handleRk(scope.row)"
                 v-hasPermi="['business:studyGyzj:rk', 'business:nonTrialGyzj:rk', 'business:drugGyzj:rk']">{{
                   $t('page.business.resource.gyzj.ruku') }}</el-button>
+              <!-- 取出 -->
+              <el-button type="text" v-if="scope.row.zjzt==3&&scope.row.cczt==3" @click="handleQc(scope.row)"
+                v-hasPermi="['business:studyGyzj:qc', 'business:nonTrialGyzj:qc', 'business:drugGyzj:qc']">{{
+                  $t('page.business.resource.gyzj.quchu') }}</el-button>
+              <!-- 存储 -->
+              <el-button type="text" v-if="scope.row.zjzt==3&&scope.row.cczt==1" @click="handleCc(scope.row)"
+                v-hasPermi="['business:studyGyzj:cc', 'business:nonTrialGyzj:cc', 'business:drugGyzj:cc']">{{
+                  $t('page.business.resource.gyzj.cunchu') }}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -112,6 +127,10 @@
       <Sqgh key="Sqgh" ref="Sqgh" @callback="handleQuery" />
       <!-- 入库 -->
       <Sqrk key="Sqrk" ref="Sqrk" @callback="handleQuery" />
+      <!-- 存储 -->
+      <Cc key="Cc" ref="Cc" @callback="handleQuery" />
+      <!-- 取出 -->
+      <Qc key="Qc" ref="Qc" @callback="handleQuery" />
       <!-- 处置药剂 -->
       <Czyj key="Czyj" ref="Czyj" @callback="handleQuery" />
       <!-- 详情 -->
@@ -124,6 +143,8 @@
 import { studyList } from "@/api/business/gyzj/gyzj"
 import Xq from "@/views/business/resource/gyzj/comps/gyzj/Xq";
 import Bj from "@/views/business/resource/gyzj/comps/gyzj/Bj";
+import Cc from "@/views/business/resource/gyzj/comps/gyzj/Cc";
+import Qc from "@/views/business/resource/gyzj/comps/gyzj/Qc";
 import Xgkc from "@/views/business/resource/gyzj/comps/gyzj/Xgkc";
 import Sqgh from "@/views/business/resource/gyzj/comps/gyzj/Sqgh";
 import Sqrk from "@/views/business/resource/gyzj/comps/gyzj/Sqrk";
@@ -132,7 +153,7 @@ import moment from "moment";
 
 export default {
   name: "GyzjList",
-  components: { Xq, Bj, Xgkc, Sqgh, Czyj,Sqrk },
+  components: { Xq, Bj, Xgkc, Sqgh, Czyj,Sqrk,Cc,Qc },
   data() {
     return {
       daterange: [],
@@ -199,6 +220,14 @@ export default {
     handleRk(row) {
       this.$refs.Sqrk.show(row)
     },
+    //取出
+    handleQc(row){
+      this.$refs.Qc.show(row)
+    },
+    //存储
+    handleCc(row){
+      this.$refs.Cc.show(row)
+    },
     closeXq() {
       this.showDetail = false
       this.handleQuery()

src/views/business/study/comp/wzlb/mjyList.vue

@@ -56,6 +56,12 @@
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.resource.mjy.sxrq')" align="center" prop="sxrq" width="150px" />
+             <el-table-column :label="$t('page.business.resource.gyzj.sfcc')" align="center" width="100px" fixed="right">
+            <template slot-scope="scope">
+               <span v-if="scope.row.cczt == 1">{{ $t('page.business.resource.resource.cczt.qc') }}</span>
+              <span v-if="scope.row.cczt == 3">{{ $t('page.business.resource.resource.cczt.cc') }}</span>
+            </template>
+          </el-table-column>
           <el-table-column :label="$t('page.business.resource.mjy.zjzt')" align="center" width="100px" fixed="right">
             <template slot-scope="scope">
               <span v-if="scope.row.zjzt == 1">{{ $t('page.business.resource.resource.zjzt.rk') }}</span>
@@ -72,7 +78,7 @@
                 <!-- 详情 -->
                 <el-button type="text" @click="handleXq(scope.row)" v-hasPermi="['business:studyMjy:xq', 'business:nonTrialMjy:xq', 'business:drugMjy:xq']">{{
                   $t('page.business.resource.mjy.detail') }}</el-button>
-               <template v-if="scope.row.syghzt == 1">
+               <template v-if="scope.row.zjzt==3&&scope.row.cczt==1">
                 <!-- 处置药剂 -->
                 <el-button type="text" @click="handleCzyj(scope.row)" v-hasPermi="['business:studyMjy:czyj', 'business:nonTrialMjy:czyj', 'business:drugMjy:czyj']">{{
                   $t('page.business.resource.mjy.czyj') }}</el-button>
@@ -85,6 +91,14 @@
                   v-hasPermi="['business:studyMjy:xgkc', 'business:nonTrialMjy:xgkc', 'business:drugMjy:xgkc']">{{
                     $t('page.business.resource.mjy.xgkc') }}</el-button>
               </template>
+              <!-- 取出 -->
+              <el-button type="text" v-if="scope.row.zjzt==3&&scope.row.cczt==3" @click="handleQc(scope.row)"
+                v-hasPermi="['business:studyMjy:qc', 'business:nonTrialMjy:qc', 'business:drugMjy:qc']">{{
+                  $t('page.business.resource.gyzj.quchu') }}</el-button>
+              <!-- 存储 -->
+              <el-button type="text" v-if="scope.row.zjzt==3&&scope.row.cczt==1" @click="handleCc(scope.row)"
+                v-hasPermi="['business:studyMjy:cc', 'business:nonTrialMjy:cc', 'business:drugMjy:cc']">{{
+                  $t('page.business.resource.gyzj.cunchu') }}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -98,6 +112,10 @@
       <Xgkc key="Xgkc" ref="Xgkc" @callback="handleQuery" />
       <!-- 处置药剂 -->
       <Czyj key="Czyj" ref="Czyj" @callback="handleQuery" />
+      <!-- 存储 -->
+      <Cc key="Cc" ref="Cc" @callback="handleQuery" />
+      <!-- 取出 -->
+      <Qc key="Qc" ref="Qc" @callback="handleQuery" />
       <!-- 详情 -->
       <Xq v-show="showDetail" key="Xq" ref="Xq" @callback="closeXq" />
     </div>
@@ -108,13 +126,15 @@
 import { studyList } from "@/api/business/mjy/mjy"
 import Xq from "@/views/business/resource/mjy/comps/mjy/Xq";
 import Bj from "@/views/business/resource/mjy/comps/mjy/Bj";
+import Cc from "@/views/business/resource/mjy/comps/mjy/Cc";
+import Qc from "@/views/business/resource/mjy/comps/mjy/Qc";
 import Xgkc from "@/views/business/resource/mjy/comps/mjy/Xgkc";
 import Czyj from "@/views/business/resource/mjy/comps/mjy/Czyj";
 import moment from "moment";
 
 export default {
   name: "MjyList",
-  components: { Xq, Bj, Xgkc, Czyj },
+  components: {Qc,Cc, Xq, Bj, Xgkc, Czyj },
   data() {
     return {
       daterange: [],
@@ -161,6 +181,14 @@ export default {
     }
   },
   methods: {
+     //取出
+    handleQc(row){
+      this.$refs.Qc.show(row)
+    },
+    //存储
+    handleCc(row){
+      this.$refs.Cc.show(row)
+    },
     //处置药剂
     handleCzyj(row) {
       this.$refs.Czyj.show(row)