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

src/api/business/sj/sj.js

@@ -99,6 +99,24 @@ export function sj_gd(data) {
   })
 }
 
+// 解档
+export function sj_jd(data) {
+  return request({
+    url: '/system/business/sj/jd',
+    method: 'post',
+    data: data
+  })
+}
+
+// 批量解档
+export function sj_jdBatch(data) {
+  return request({
+    url: '/system/business/sj/plgd',
+    method: 'post',
+    data: data
+  })
+}
+
 // 批量归档
 export function sj_plgd(data) {
   return request({

src/router/index.js

@@ -280,6 +280,20 @@ export const dynamicRoutes = [
       }
     ]
   },
+  {
+    path: '/resource/specimen',
+    component: Layout,
+    hidden: true,
+    permissions: ['business:resource:gsp:list'],
+    children: [
+      {
+        path: ':tab',
+        component: () => import('@/views/business/resource/gsp/index'),
+        name: 'Gsp',
+        meta: { title: 'loading', activeMenu: '/resource/gsp/gspList' }
+      }
+    ]
+  },
 ]
 
 // 防止连续点击多次路由报错

src/views/business/archive/gsp/comps/rkjlList.vue

@@ -57,10 +57,10 @@
               {{ scope.row.gg }} {{ scope.row.ggdw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.gsp.dasqr')" align="center" prop="dasqrMc" width="150px"
+          <el-table-column :label="$t('page.business.resource.gsp.gdsqr')" align="center" prop="gdsqrMc" width="150px"
             :show-overflow-tooltip="true" />
 
-          <el-table-column :label="$t('page.business.resource.gsp.jlzt')" align="center" width="100px" fixed="right">
+          <el-table-column :label="$t('page.business.resource.gsp.jlzt')" align="center" width="100px" >
             <template slot-scope="scope">
               <span v-if="scope.row.jlzt == 1">{{ $t('page.business.resource.resource.jlzt.wsd') }}</span>
               <span v-if="scope.row.jlzt == 3">{{ $t('page.business.resource.resource.jlzt.ysd') }}</span>
@@ -69,7 +69,7 @@
               <span v-if="scope.row.jlzt == 9">{{ $t('page.business.resource.resource.jlzt.djd') }}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.gsp.jyzt')" align="center" width="100px" fixed="right">
+          <el-table-column :label="$t('page.business.resource.gsp.jyzt')" align="center" width="100px">
             <template slot-scope="scope">
               <span v-if="scope.row.jyzt == 1">{{ $t('page.business.resource.resource.jyzt.wjy') }}</span>
               <span v-if="scope.row.jyzt == 3">{{ $t('page.business.resource.resource.jyzt.djy') }}</span>

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

@@ -142,7 +142,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: this.$t('page.form.edit'),
+        qmyy: this.$t('form.edit'),
         sdrmm: null
       }
       this.resetForm("form")

src/views/business/resource/sj/comps/Jd.vue

@@ -30,8 +30,8 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="text" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
+import { sj_jd, sj_jdBatch } from "@/api/business/sj/sj"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
@@ -60,7 +60,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -111,12 +111,12 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
-            mjy_jdBatch(this.form).then(response => {
+            sj_jdBatch(this.form).then(response => {
               this.open = false
               this.$emit('callback')
             })
           } else {
-            mjy_jd(this.form).then(response => {
+            sj_jd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
             })

src/views/business/resource/yq/comps/detail.vue

@@ -38,7 +38,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.yq.ssbm')" prop="bmId">
-              <el-input v-model="form.bmId" :placeholder="$t('form.placeholderSelect')" disabled />
+              <el-input v-model="form.bmMc" :placeholder="$t('form.placeholderSelect')" disabled />
             </el-form-item>
           </el-col>
         </el-row>

src/views/business/resource/yq/list.vue

@@ -130,7 +130,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('form.signerPsw')" prop="qmrmm">
-              <el-input v-model="form.qmrmm" :placeholder="$t('form.placeholderInput')" type="password"
+              <el-input v-model="form.qmrmm" show-password :placeholder="$t('form.placeholderInput')" type="password"
                 maxlength="20" />
             </el-form-item>
           </el-col>