fix:[资源库管理][供试品]

src/api/business/gsp/gsp.js

@@ -218,4 +218,23 @@ export function exportDetail(query) {
     method: 'get',
     params: query
   })
+}
+
+
+//存储
+export function cc(data) {
+  return request({
+    url: '/system/business/gsp/cc',
+    method: 'post',
+    data: data
+  })
+}
+
+//取出
+export function qc(data) {
+  return request({
+    url: '/system/business/gsp/qc',
+    method: 'post',
+    data: data
+  })
 }

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

@@ -0,0 +1,188 @@
+<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" v-if="open">
+        <div class="sbzdtcma"> <input type="text"> <input   type="password" show-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.ccwz')" prop="ccwz">
+              <BusinessSelect v-model="form.ccwz" dictType="business_ccwz" @change="ccwzChange"></BusinessSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.cctj')" prop="cctj">
+              <BusinessSelect v-model="form.cctj" dictType="business_cctj" :multiple="true"></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" show-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" show-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/gsp/gsp"
+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: {
+      ccwzChange(val){
+      this.form.cctj=val.wc
+    },
+    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/gsp/comps/gsp/Xq copy.vue

@@ -0,0 +1,237 @@
+<template>
+  <!-- 详情 -->
+  <div v-if="open">
+    <div class="detail-container">
+      <div class="detail-top">
+        <div class="left-top">
+          <img src="@/assets/images/back.png" @click="cancel()" />
+          <div class="left-title"></div>
+        </div>
+        <div class="right-top">
+          <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
+          <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
+        </div>
+      </div>
+      <div class="detail-title"><img src="@/assets/images/detail-title.png">{{ $t('page.business.resource.gyzj.gyzjxq')
+      }}<img src="@/assets/images/detail-title.png" /></div>
+      <div class="detail-content">
+        <div class="content-left">
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.resource.gyzj.jbxx') }}</div>
+          </div>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.resource.gyzj.mc') }}</div>
+              <el-input type="text" :value="form.mc" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.gyzj.bh') }}</div>
+              <el-input type="text" :value="form.bh" maxlength="50" disabled />
+            </div>
+          </div>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.resource.gyzj.nd') }}</div>
+              <el-input type="text" :value="form.nd" maxlength="50" disabled> <template slot="append">{{
+                form.nddw }}</template>
+              </el-input>
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.gyzj.kcl') }}</div>
+              <el-input type="text" :value="form.kc" maxlength="50" disabled> <template slot="append">{{
+                form.kcdw }}</template> </el-input>
+            </div>
+          </div>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.resource.gyzj.sxrq') }}</div>
+              <el-input type="text" :value="form.sxrq" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.gyzj.cctj') }}</div>
+              <el-input type="text" :value="form.cctj" maxlength="50" disabled />
+            </div>
+          </div>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.resource.gyzj.ccwz') }}</div>
+              <el-input type="text" :value="form.ccwz" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.gyzj.zjzt') }}</div>
+              <el-select v-model="form.zjzt" disabled style="width: 100%;">
+                <el-option key="1" :label="$t('page.business.resource.resource.zjzt.rk')" :value="1" />
+                <el-option key="2" :label="$t('page.business.resource.resource.zjzt.wrk')" :value="2" />
+                <el-option key="3" :label="$t('page.business.resource.resource.zjzt.yff')" :value="3" />
+                <el-option key="5" :label="$t('page.business.resource.resource.zjzt.ysd')" :value="5" />
+                <el-option key="7" :label="$t('page.business.resource.resource.zjzt.dgd')" :value="7" />
+                <el-option key="9" :label="$t('page.business.resource.resource.zjzt.gd')" :value="9" />
+                <el-option key="11" :label="$t('page.business.resource.resource.zjzt.djd')" :value="11" />
+              </el-select>
+            </div>
+          </div>
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.resource.gyzj.bdxx') }} </div>
+          </div>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.resource.gyzj.sssy') }}</div>
+              <el-input type="text" :value="form.studyMc" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.gyzj.ssbd') }}</div>
+              <el-input type="text" :value="form.bdMc" maxlength="50" disabled />
+            </div>
+          </div>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.resource.gyzj.bdssr') }}</div>
+              <el-input type="text" :value="form.bdgsrMc" maxlength="50" disabled />
+            </div>
+          </div>
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.resource.gyzj.tz') }}</div>
+          </div>
+          <div class="pal">
+            <el-table :data="tzList" v-loading="loadingTz">
+              <el-table-column :label="$t('page.business.resource.gyzj.syr')" align="center"
+                :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    {{ scope.row.qmrMc }}
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('page.business.resource.gyzj.lqghr')" align="center"
+                :show-overflow-tooltip="true" width="200px">
+                <template slot-scope="scope">
+                    {{ scope.row.lqrMc }}{{ scope.row.ghrMc }}
+
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('page.business.resource.gyzj.ffjsr')" align="center"
+                :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    {{ scope.row.ffrMc }}{{ scope.row.jsrMc }}
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('page.business.resource.gyzj.czlx')" align="center"
+                :prop="$i18n.locale === 'zh_CN' ? 'qmyy' : 'qmyyEn'" width="100" />
+                <el-table-column :label="$t('page.business.resource.gyzj.bdmc')" align="center"
+                prop="bdMc" width="100" :show-overflow-tooltip="true"/>
+              <el-table-column :label="$t('page.business.resource.gyzj.czl')" align="center"
+                :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                  {{ scope.row.czl }}{{ scope.row.czldw }}
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('page.business.resource.gyzj.bzyy')" align="center" prop="remark"
+                :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.resource.gyzj.ccsj')" align="center" prop="createTime"
+                width="150px" />
+            </el-table>
+          </div>
+          <div class="pal">
+            <pagination v-show="totalTz > 0" :total="totalTz" :page.sync="queryParamstZ.pageNum"
+              :limit.sync="queryParamstZ.pageSize" @pagination="getTzList" />
+          </div>
+        </div>
+        <div class="content-right">
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.resource.gyzj.jcgj') }}</div>
+          </div>
+          <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
+
+          <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
+            @pagination="getJjcgjList" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { info, tzList, jcgjList,exportDetail } from "@/api/business/gyzj/gyzj"
+import JcgjList from "@/views/business/comps/common/JcgjList";
+
+export default {
+  name: "Xq",
+  components: { JcgjList },
+  data() {
+    return {
+      form: {},
+      appTitle: process.env.VUE_APP_TITLE,
+      tzList: [],
+      totalTz: 0,
+      loadingTz: true,
+      open: false,
+      queryParamstZ: {
+        gyzjId: null,
+        pageNum: 1,
+        pageSize: 10
+      },
+      jcgjTotal: 0,
+      jcgjList: [],
+      queryJcgjParams: {
+        pageNum: 1,
+        gyzjId: null,
+        pageSize: 10,
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+   exportExcel() {
+      this.$modal.loading()
+      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.appTitle }).then(response => {
+        window.open(process.env.VUE_APP_FILE_DOMAIN +response.msg)
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    getJjcgjList(val) {
+      this.$modal.loading()
+      jcgjList(_.merge({}, this.queryJcgjParams, val)).then(response => {
+        this.jcgjList = response.rows
+        this.jcgjTotal = response.total
+        this.$refs.jcgjList.init(this.jcgjList)
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+
+    cancel() {
+      this.open = false
+      this.$emit('callback')
+    },
+    getTzList() {
+      this.loadingTz = true
+      tzList(this.queryParamstZ).then(response => {
+        this.tzList = response.rows
+        this.totalTz = response.total
+        this.loadingTz = false
+        this.getJjcgjList()
+      })
+    },
+    show(row) {
+      this.$modal.loading()
+      this.queryParamstZ.gyzjId = row.id
+      this.queryJcgjParams.gyzjId = row.id
+      this.$modal.loading()
+      info({ id: row.id }).then(response => {
+        this.form = response.data
+        this.open = true
+        this.getTzList()
+        this.saveSimpleLog({name:row.bh,nameEn:row.bh,jcmc:'给药制剂详情',jcmcEn:'Formulation Detail'})
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    }
+  }
+}
+</script>

src/views/business/resource/gsp/comps/gsp/Xz.vue

@@ -107,7 +107,7 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.qmbz')" prop="qmbz">
+            <el-form-item :label="$t('form.remark')" prop="qmbz">
               <el-input type="textarea" v-model="form.qmbz" :rows="2" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>

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

@@ -59,6 +59,14 @@
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.resource.gsp.sxrq')" align="center" prop="sxr" 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"><span class="status-circle yes"></span>{{
+                $t('page.business.resource.resource.cczt.qc') }}</span>
+              <span v-if="scope.row.cczt == 3"><span class="status-circle no"></span>{{
+                $t('page.business.resource.resource.cczt.cc') }}</span>
+            </template>
+          </el-table-column>
           <el-table-column :label="$t('page.business.resource.gsp.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>
@@ -74,23 +82,32 @@
             <template slot-scope="scope">
               <!-- 详情 -->
               <el-button type="text" @click="handleXq(scope.row)"
-                v-hasPermi="['business:studyMjy:xq', 'business:nonTrialMjy:xq', 'business:drugMjy:xq']">{{
+                v-hasPermi="['business:studyGsp:xq', 'business:nonTrialGsp:xq', 'business:drugGsp:xq']">{{
                   $t('page.business.resource.gsp.detail') }}</el-button>
               <template v-if="queryParams.studyStatus < 5">
-                <template v-if="scope.row.syghzt == 1">
+                <template v-if="scope.row.zjzt == 3 && scope.row.cczt == 1">
                   <!-- 处置 -->
                   <el-button type="text" @click="handleCz(scope.row)"
-                    v-hasPermi="['business:studyMjy:czyj', 'business:nonTrialMjy:czyj', 'business:drugMjy:czyj']">{{
+                    v-hasPermi="['business:studyGsp:cz', 'business:nonTrialGsp:cz', 'business:drugGsp:cz']">{{
                       $t('page.business.resource.gsp.cz') }}</el-button>
                   <!-- 编辑 -->
                   <el-button type="text" @click="handleBj(scope.row)"
-                    v-hasPermi="['business:studyMjy:bj', 'business:nonTrialMjy:bj', 'business:drugMjy:bj']">{{
+                    v-hasPermi="['business:studyGsp:bj', 'business:nonTrialGsp:bj', 'business:drugGsp:bj']">{{
                       $t('form.edit') }}</el-button>
                   <!-- 修改库存 -->
                   <el-button type="text" @click="handleXgkc(scope.row)"
-                    v-hasPermi="['business:studyMjy:xgkc', 'business:nonTrialMjy:xgkc', 'business:drugMjy:xgkc']">{{
+                    v-hasPermi="['business:studyGsp:xgkc', 'business:nonTrialGsp:xgkc', 'business:drugGsp:xgkc']">{{
                       $t('page.business.resource.gsp.xgkc') }}</el-button>
                 </template>
+
+                <!-- 取出 -->
+                <el-button type="text" v-if="scope.row.cczt == 3" @click="handleQc(scope.row)"
+                  v-hasPermi="['business:studyGsp:qc', 'business:nonTrialGsp:qc', 'business:drugGsp:qc']">{{
+                    $t('page.business.resource.gyzj.quchu') }}</el-button>
+                <!-- 存储 -->
+                <el-button type="text" v-if="scope.row.cczt == 1" @click="handleCc(scope.row)"
+                  v-hasPermi="['business:studyGsp:cc', 'business:nonTrialGsp:cc', 'business:drugGsp:cc']">{{
+                    $t('page.business.resource.gyzj.cunchu') }}</el-button>
               </template>
             </template>
           </el-table-column>
@@ -105,6 +122,10 @@
       <Xgkc key="Xgkc" ref="Xgkc" @callback="handleQuery" />
       <!-- 处置 -->
       <Cz key="Cz" ref="Cz" @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>
@@ -117,11 +138,12 @@ import Xq from "@/views/business/resource/gsp/comps/gsp/Xq";
 import Bj from "@/views/business/resource/gsp/comps/gsp/Bj";
 import Xgkc from "@/views/business/resource/gsp/comps/gsp/Xgkc";
 import Cz from "@/views/business/resource/gsp/comps/gsp/Cz";
-import moment from "moment";
+import Cc from "@/views/business/resource/gyzj/comps/gyzj/Cc";
+import Qc from "@/views/business/resource/gyzj/comps/gyzj/Qc";
 
 export default {
   name: "GspList",
-  components: { Xq, Bj, Xgkc, Cz },
+  components: { Xq, Bj, Xgkc, Cz, Cc, Qc },
   data() {
     return {
       daterange: [],
@@ -197,6 +219,14 @@ export default {
       this.$emit('showDetail', this.showDetail)
       this.$refs.Xq.show(row)
     },
+    //取出
+    handleQc(row) {
+      this.$refs.Qc.show(row)
+    },
+    //存储
+    handleCc(row) {
+      this.$refs.Cc.show(row)
+    },
     //获取列表
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {

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

@@ -71,21 +71,21 @@
               <!-- 详情 -->
               <template
                 v-if="scope.row.zjzt == 1 || scope.row.zjzt == 5 || (scope.row.zjzt == 9 && scope.row.jyzt == 5)">
-                <el-button type="text" @click="handleXq(scope.row)" v-hasPermi="['business:resource:sj:xq']">{{
+                <el-button type="text" @click="handleXq(scope.row)" v-hasPermi="['business:studySj:xq']">{{
                   $t('page.business.resource.sj.detail') }}</el-button>
               </template>
               <template v-if="queryParams.studyStatus < 5">
                 <!-- 处置 -->
                 <template v-if="scope.row.zjzt == 1">
-                  <el-button type="text" @click="handleCz(scope.row)" v-hasPermi="['business:resource:sj:cz']">{{
+                  <el-button type="text" @click="handleCz(scope.row)" v-hasPermi="['business:studySj:cz']">{{
                     $t('page.business.resource.sj.cz') }}</el-button>
                 </template>
                 <template v-if="scope.row.zjzt == 1">
                   <!-- 编辑 -->
-                  <el-button type="text" @click="handleBj(scope.row)" v-hasPermi="['business:resource:sj:bj']">{{
+                  <el-button type="text" @click="handleBj(scope.row)" v-hasPermi="['business:studySj:bj']">{{
                     $t('form.edit') }}</el-button>
                   <!-- 修改库存 -->
-                  <el-button type="text" @click="handleXgkc(scope.row)" v-hasPermi="['business:resource:sj:xgkc']">{{
+                  <el-button type="text" @click="handleXgkc(scope.row)" v-hasPermi="['business:studySj:xgkc']">{{
                     $t('page.business.resource.sj.xgkc') }}</el-button>
                 </template>
               </template>