第三方产品维护和配送产品整合

2 years ago · 0e6a12d02e
parent cf4a1548c3
commit 0e6a12d02e
4 changed files with 93 additions and 32 deletions
--- a/.env.production
+++ b/.env.production
@ -4,7 +4,7 @@ VUE_APP_TITLE = UDI自助平台
 # 生产环境配置
 ENV = 'production'
 # VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
-VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://192.168.0.66:9160/UDI_WMS_MC/'
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@ -220,9 +220,7 @@
                  <i class="el-icon-set-up"></i>
                  参数值
                </template>
-                <el-radio-group v-model="editQuery.enable">
-                  <el-input style="width: 150%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.overStockNum"></el-input>
-                </el-radio-group>
+                  <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.overStockNum"></el-input>
              </el-descriptions-item>
              <el-descriptions-item>
                <template slot="label">
@ -232,8 +230,6 @@
                库存积压预警数量
              </el-descriptions-item>

-
-
              <el-descriptions-item>
                <template slot="label">
                  <i class="el-icon-setting"></i>
--- a/src/views/supplier/products/supDiProductsCheck.vue
+++ b/src/views/supplier/products/supDiProductsCheck.vue
@ -70,9 +70,9 @@
      <el-divider style="margin: 15px"></el-divider>

      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
-        <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品标识" prop="code" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品名称" prop="name" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="standard" show-overflow-tooltip></el-table-column>
        <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
        <el-table-column label="注册证编号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
        <el-table-column label="审核状态" prop="status" show-overflow-tooltip>
@ -108,6 +108,19 @@
    >
      <selectDiDetail :editQuery="thisData"></selectDiDetail>
    </el-dialog>
+
+    <el-dialog
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="产品信息详情"
+      :visible.sync="thrProductsDiDetailVisible"
+      width="80%"
+      v-if="thrProductsDiDetailVisible"
+    >
+      <thrProductsDetail
+        :data="thisDetail"
+      ></thrProductsDetail>
+    </el-dialog>
    <el-dialog
      :close-on-click-modal="false"
      :close-on-press-escape="false"
@ -141,6 +154,7 @@ import {
 import selectDiDetail from '@/views/supplier/products/selectDIDetailDialog'
 import ThrProductsAdd from '@/views/supplier/products/supProductsAdd'
 import { filterCustomers } from '@/api/auth/customer'
+import thrProductsDetail from '@/views/supplier/products/supProductsDetail'

 export default {
  data() {
@ -159,11 +173,13 @@ export default {
      },
      total: 0,
      list: [],
+      thisDetail:null,
      uploadFileUrl: null,
      fileList: [],
      checkVisible: false,
      newType: 1,
      thrProductsDetailVisible: false,
+      thrProductsDiDetailVisible: false,
      thisData: null,
      loading: false,
      checkMap: {
@ -252,13 +268,20 @@ export default {
        })
    },
    detailDialog(row) {
-      let param = { uuid: row.uuid }
-      getDiProductDetail(param).then((res) => {
-        if (res.code === 20000) {
-          this.thisData = res.data
-          this.thrProductsDetailVisible = true
-        }
-      })
+      if(row.type==1){
+        let query = { uuid: row.uuid }
+        getDiProductDetail(query).then((res) => {
+          if (res.code === 20000) {
+            this.diDetails = res.data
+            this.detailDialog = true
+          } else {
+            this.$message.error('参数错误')
+          }
+        })
+      }else{
+        this.thisDetail = row;
+        this.thrProductsDiDetailVisible = true;
+      }
    },
    handleCurrentChange(val) {
      this.filterQuery.page = val.page
@ -301,7 +324,7 @@ export default {
    }
  },
  components: {
-    ThrProductsAdd, selectDiDetail
+    ThrProductsAdd, selectDiDetail,thrProductsDetail
  },
  mounted() {
  },
--- a/src/views/supplier/products/supProductsAddDi.vue
+++ b/src/views/supplier/products/supProductsAddDi.vue
@ -46,16 +46,17 @@
          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
          <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="addDiProductVisible=true">新增</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="addDiProductVisible=true">选入</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="addProductVisible=true">新增</el-button>
        </el-button-group>
      </div>
      <el-divider style="margin: 15px"></el-divider>

      <el-table :data="list" style="width: 100%" v-loading="loading" border highlight-current-row="true">
        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品标识" prop="code" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品名称" prop="name" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="standard" show-overflow-tooltip></el-table-column>
        <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
        <el-table-column label="注册证编号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
        <el-table-column label="审核状态" prop="status" show-overflow-tooltip>
@ -83,7 +84,7 @@
    </el-card>

    <el-dialog
-      title="新增配送产品"
+      title="选入配送产品"
      :close-on-click-modal="false"
      :close-on-press-escape="false"
      :visible.sync="addDiProductVisible"
@ -101,6 +102,23 @@
      </thrAddDiProductSelectUdi>
    </el-dialog>

+    <el-dialog
+      title="新增配送产品"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :visible.sync="addProductVisible"
+      width="85%"
+      append-to-body
+      v-if="addProductVisible"
+    >
+      <thrAddProductSelectUdi
+        :closeAddDialog="closeDialog"
+        :newType="newType"
+        @closeUdi="closeUdi"
+      >
+      </thrAddProductSelectUdi>
+    </el-dialog>
+
    <el-dialog
      title="器械信息详情"
      :close-on-click-modal="false"
@ -114,18 +132,34 @@
      </selectDiDetail>
    </el-dialog>

+    <el-dialog
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="产品信息详情"
+      :visible.sync="thrProductsDetailVisible"
+      width="80%"
+      v-if="thrProductsDetailVisible"
+    >
+      <thrProductsDetail
+        :data="thisDetail"
+      ></thrProductsDetail>
+    </el-dialog>
+
  </div>
 </template>
 <script>

 import { getThrDiProducts, delThrDiProducts, getDiProductDetail } from '@/api/supplier/supProductsAddDi'
 import thrAddDiProductSelectUdi from '@/views/supplier/products/supAddDiProductSelectUdi'
+import thrAddProductSelectUdi from '@/views/supplier/products/supProductsAdd'
 import selectDiDetail from './selectDIDetailDialog'
+import thrProductsDetail from '@/views/supplier/products/supProductsDetail'

 export default {
  data() {
    return {
      showSearch: true,
+      thisDetail:null,
      filterQuery: {
        code: null,
        name: null,
@ -141,6 +175,7 @@ export default {
      thirdSysDetail: null,
      list: [],
      addDiProductVisible: false,
+      addProductVisible: false,
      checkVisible: false,
      newType: 2,
      thrProductsDetailVisible: false,
@ -214,15 +249,20 @@ export default {
      this.getList()
    },
    detail(row) {
-      let query = { uuid: row.uuid }
-      getDiProductDetail(query).then((res) => {
-        if (res.code === 20000) {
-          this.diDetails = res.data
-          this.detailDialog = true
-        } else {
-          this.$message.error('参数错误')
-        }
-      })
+     if(row.type==1){
+       let query = { uuid: row.uuid }
+       getDiProductDetail(query).then((res) => {
+         if (res.code === 20000) {
+           this.diDetails = res.data
+           this.detailDialog = true
+         } else {
+           this.$message.error('参数错误')
+         }
+       })
+     }else{
+       this.thisDetail = row;
+       this.thrProductsDetailVisible = true;
+     }
    },
    deleteProduct(id) {
      let query = {
@ -241,6 +281,8 @@ export default {
      this.selectErpDialogVisible = false
      this.selectLocalVisible = false
      this.selectVersionVisible = false
+      this.addProductVisible = false
+      this.getList();
    },
    closeUdi(val) {
      this.addDiProductVisible = false
@ -250,7 +292,7 @@ export default {
    }
  },
  components: {
-    thrAddDiProductSelectUdi, selectDiDetail
+    thrAddDiProductSelectUdi, selectDiDetail,thrAddProductSelectUdi,thrProductsDetail
  },
  mounted() {
  },