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

src/views/business/resource/gsp/comps/ffjl/Gd.vue

@@ -141,11 +141,13 @@ export default {
           if (this.isBatch) {
             plgd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           } else {
             gd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }

src/views/business/resource/gsp/comps/ffjl/Jd.vue

@@ -130,11 +130,13 @@ export default {
           if (this.isBatch) {
             jdBatch(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           } else {
             jd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }

src/views/business/resource/gsp/comps/ffjl/Jq.vue

@@ -114,6 +114,7 @@ export default {
         if (valid) {
             jq(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
         }

src/views/business/resource/gsp/comps/ffjl/Js.vue

@@ -117,6 +117,7 @@ export default {
         if (valid) {
           js(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }

src/views/business/resource/gsp/comps/ffjl/Jy.vue

@@ -149,6 +149,7 @@ export default {
 
           jy(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }

src/views/business/resource/gsp/comps/ffjl/Sd.vue

@@ -141,11 +141,13 @@ export default {
           if (this.isBatch) {
             plsd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           } else {
             sd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }

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

@@ -176,6 +176,7 @@ export default {
           cc(this.form).then(response => {
             this.open = false
             this.$emit('callback')
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$modal.closeLoading()
           }).finally(() => {
             this.$modal.closeLoading()

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

@@ -152,6 +152,7 @@ export default {
         if (valid) {
           cz(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }

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

@@ -172,6 +172,7 @@ export default {
             plcz(params).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$modal.closeLoading()
             }).finally(() => {
               this.$modal.closeLoading()

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

@@ -30,11 +30,10 @@
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('page.business.resource.gsp.zysx')" align="center" prop="zysx"
-                  width="130px" />
+                  width="130px" :show-overflow-tooltip="true"/>
                 <el-table-column :label="$t('page.business.resource.gsp.zytj')" align="center" width="250px">
                   <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.zytj" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')" />
+                      <BusinessSelect v-model="scope.row.zytj" dictType="business_zytj"></BusinessSelect>
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('page.business.resource.mjy.md')" align="center" width="250px">
@@ -427,6 +426,7 @@ export default {
           } else {
             ff(params).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }

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

@@ -117,11 +117,13 @@ export default {
           if (this.isBatch) {
             plgd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           } else {
             gd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }

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

@@ -68,7 +68,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.zytj')" prop="ghzytj">
-              <el-input type="text" v-model="form.ghzytj" maxlength="50" />
+               <BusinessSelect v-model="form.ghzytj" dictType="business_zytj"></BusinessSelect>
             </el-form-item>
           </el-col>
         </el-row>
@@ -172,10 +172,11 @@
 import { gh, info } 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: "GspGh",
-  components: { SelectDeptUser },
+  components: { SelectDeptUser, BusinessSelect },
   data() {
     return {
       isBatch: false,
@@ -275,20 +276,12 @@ export default {
     },
     show(row) {
       this.reset()
-      this.form.id = row.id
-      this.form.mc = row.mc
-      this.form.bh = row.bh
-      this.form.ph = row.ph
-      this.form.gg = row.gg
-      this.form.ggdw = row.ggdw
-      this.form.yxq = row.yxq
-      this.form.jsrq = row.jsrq
-      this.form.ffrq = row.ffrq
-      this.form.cctj = row.cctj
-      this.form.kc = row.kc
-      this.form.kcdw = row.kcdw
-      this.form.zysx = row.zysx
-      this.open = true
+      info({id: row.id}).then(response => {
+        this.form = response.data
+        this.open = true
+      })
+
+
     },
     save() {
       this.$refs["form"].validate(valid => {

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

@@ -117,6 +117,7 @@ export default {
         if (valid) {
           js(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }

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

@@ -175,6 +175,7 @@ export default {
         if (valid) {
           jy(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
 

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

@@ -116,11 +116,13 @@ export default {
           if (this.isBatch) {
             plsd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           } else {
             sd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }

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

@@ -226,6 +226,7 @@ export default {
         if (valid) {
           save(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }

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

@@ -207,6 +207,7 @@ export default {
           params.list = this.selectList
           ysff(params).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }

src/views/business/resource/gsp/comps/rkjl/Bj.vue

@@ -214,6 +214,7 @@ export default {
         if (valid) {
           bj(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }

src/views/business/resource/gsp/comps/rkjl/Gd.vue

@@ -141,11 +141,13 @@ export default {
           if (this.isBatch) {
             plgd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           } else {
             gd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }

src/views/business/resource/gsp/comps/rkjl/Jd.vue

@@ -131,11 +131,13 @@ export default {
           if (this.isBatch) {
             jdBatch(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           } else {
             jd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }

src/views/business/resource/gsp/comps/rkjl/Js.vue

@@ -117,6 +117,7 @@ export default {
         if (valid) {
           js(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }

src/views/business/resource/gsp/comps/rkjl/Jy.vue

@@ -149,6 +149,7 @@ export default {
 
           jy(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }

src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue

@@ -118,10 +118,12 @@ export default {
       this.upload.open = false
       this.upload.isUploading = false
       this.$refs.upload.clearFiles()
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
       if(response.code == 200) {
+        this.$modal.msgSuccess("导入成功");
         this.$emit('callback')
         this.cancel()
+      } else {
+        this.$modal.alertError(response.msg);
       }
     },
     // 提交上传文件

src/views/business/resource/gsp/comps/rkjl/Sd.vue

@@ -141,11 +141,13 @@ export default {
           if (this.isBatch) {
             plsd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           } else {
             sd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }

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

@@ -221,6 +221,7 @@ export default {
         if (valid) {
           xz(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }

src/views/business/storageLocation/comps/StorageLocationImport.vue

@@ -118,10 +118,12 @@ export default {
       this.upload.open = false
       this.upload.isUploading = false
       this.$refs.upload.clearFiles()
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
       if(response.code == 200) {
+        this.$modal.msgSuccess("导入成功");
         this.$emit('callback')
         this.cancel()
+      } else {
+        this.$modal.alertError(response.msg);
       }
     },
     // 提交上传文件