5-10 生产企业

src/api/thrsys/thrHsfl.js

@@ -16,3 +16,14 @@ export function getThrProductType(query) {
     params: query
   });
 }
+
+
+  export function getTBasicProducts(query) {
+    return axios({
+      url: "/udiwms/thrsys/getBasicProducts",
+      method: "get",
+      params: query
+    });
+  }
+
+

src/views/basic/product/productEdit.vue

@@ -67,14 +67,28 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" >
-            <el-form-item label="生产企业:">
+            <el-form-item :label="'生产企业:'">
-              <el-input
+              <el-select
-                style="width: 80%"
-                size="small"
-                splaceholder="请输入内容"
                 v-model="editQuery.manufactory"
-              ></el-input>
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择生产企业"
+                :remote-method="findProducts"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="item in probucts"
+                  :key="item.unitId"
+                  :label="item.name"
+                  :value="item.unitId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.unitId }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -713,7 +727,7 @@ import selectErp from "./udiInfoselectErpUdi";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Treeselect from "@riophae/vue-treeselect";
 import {getListMenu, getOneName} from '@/api/basic/basicHospType'
-import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
+import {getHslbs, getThrProductType,getTBasicProducts} from "@/api/thrsys/thrHsfl";
 
 
 export default {
@@ -776,6 +790,7 @@ export default {
       loading: false,
       hsflOptions: [],
       thrTypeOptions: [],
+      probucts:[],
     }
   },
   components: {
@@ -800,6 +815,7 @@ export default {
     if (this.editQuery.basicPrductRemak7 != null) {
       this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
     }
+    this.findProducts()
   },
   methods: {
     getYbHcData(){
@@ -1059,6 +1075,23 @@ export default {
           this.loading = false;
         });
     },
+    findProducts(query) {
+      this.probucts = [];
+      let cQuery = {
+        key: query,
+        page: 1,
+        limit: 20
+      };
+      getTBasicProducts(cQuery)
+        .then((response) => {
+          console.log("heiheiehi",response)
+          this.loading = false;
+          this.probucts = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
     findThrTypeMethod(query) {
       this.thrTypeOptions = [];
       let cQuery = {

src/views/supplier/company/basicCompanyproductEdit.vue

@@ -64,10 +64,34 @@
               <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.measname"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!--<el-col :span="12">-->
-            <el-form-item label="生产企业:">
+          <!--  <el-form-item label="生产企业:">-->
-              <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.manufactory"
+          <!--    <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.manufactory"-->
-              ></el-input>
+          <!--    ></el-input>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+          <el-col :span="12" >
+            <el-form-item :label="'生产企业:'">
+              <el-select
+                v-model="editQuery.manufactory"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择生产企业"
+                :remote-method="findProducts"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="item in probucts"
+                  :key="item.unitId"
+                  :label="item.name"
+                  :value="item.unitId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.unitId }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -366,7 +390,7 @@ import {updateById} from '@/api/basic/udiRelevance'
 import {filterByUuid} from '@/api/basic/udiInfo'
 import selectErp from "./udiInfoselectErpUdi";
 import selectUdiVersion from '@/views/basic/product/UdiinfoSelectVersion'
-import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
+import {getHslbs, getThrProductType,getTBasicProducts} from "@/api/thrsys/thrHsfl";
 
 export default {
   name: 'productEdit',
@@ -415,6 +439,7 @@ export default {
       selectErpDialogVisible: false,  //选入ERP产品
       hsflOptions: [],
       thrTypeOptions: [],
+      probucts:[],
     }
   },
 
@@ -623,7 +648,23 @@ export default {
           this.loading = false;
         });
     },
-
+    findProducts(query) {
+      this.probucts = [];
+      let cQuery = {
+        key: query,
+        page: 1,
+        limit: 20
+      };
+      getTBasicProducts(cQuery)
+        .then((response) => {
+          console.log("heiheiehi",response)
+          this.loading = false;
+          this.probucts = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
   },
   components: {
     selectErp
@@ -639,8 +680,9 @@ export default {
     // if (this.editQuery.basicPrductRemak8 != null) {
     this.findHsflMethod(this.editQuery.basicPrductRemak8);
     // }
-    // if (this.editQuery.basicPrductRemak7 != null) {
+    // if (this.editQuery.basicPrductRemak7 != null) { manufactory
     this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
+    this.findProducts()
     // }
 console.log("editQuery:",this.editQuery)
   }, directives: {

src/views/supplier/products/supAddDiProductSelectUdi.vue

@@ -372,6 +372,30 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12" >
+            <el-form-item :label="'生产企业:'">
+              <el-select
+                v-model="editQuery.manufactory"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择生产企业"
+                :remote-method="findProducts"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="item in probucts"
+                  :key="item.unitId"
+                  :label="item.name"
+                  :value="item.unitId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.unitId }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
           <el-col :span="12" class="el-col"
                   v-if="productRemarkSet.remarkEnable8==true  && editQuery.basicPrductRemak6=='1'">
@@ -430,7 +454,7 @@ import selectDiDetail from './selectDIDetailDialog'
 import store from '@/store'
 import {getBasicThirdSys} from '@/api/basic/basicThirdSys'
 import {finProductSet} from '@/api/param/systemParamConfig'
-import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
+import { getHslbs, getTBasicProducts, getThrProductType } from '@/api/thrsys/thrHsfl'
 
 export default {
   name: 'closeDialog',
@@ -520,6 +544,7 @@ export default {
       productRemarkSet: {},
       hsflOptions: [],
       thrTypeOptions: [],
+      probucts:[],
     }
   },
   methods: {
@@ -804,6 +829,23 @@ export default {
           this.loading = false;
         });
     },
+    findProducts(query) {
+      this.probucts = [];
+      let cQuery = {
+        key: query,
+        page: 1,
+        limit: 20
+      };
+      getTBasicProducts(cQuery)
+        .then((response) => {
+          console.log("heiheiehi",response)
+          this.loading = false;
+          this.probucts = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
     findThrTypeMethod(query) {
       this.thrTypeOptions = [];
       let cQuery = {
@@ -825,6 +867,7 @@ export default {
   created() {
     this.getBasicThirdSys()
     this.findBasicProductSet()
+    this.findProducts()
   },
   components: {
     selectDiDetail

src/views/sync/SysUdimsConfig.vue

@@ -385,6 +385,41 @@
             <!-- <el-checkbox v-model="configQuery.dbDiProducts">DI产品信息</el-checkbox>
         <el-checkbox v-model="configQuery.dbDiProducts"
           >医疗器械注册人</el-checkbox
+        > -->
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 设备管理</template>
+            <el-form
+              label-positiom="right"
+              label-width="200px"
+              :inline="true"
+              disabled
+            >
+              <el-form-item label="设备信息管理" style="padding-top: 20px">
+                <el-select v-model="configQuery.deviceInfo">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="巡检管理" style="padding-top: 20px">
+                <el-select v-model="configQuery.deviceCheck">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="报修管理" style="padding-top: 20px">
+                <el-select v-model="configQuery.deviceRepairApply">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <!-- <el-checkbox v-model="configQuery.dbDiProducts">DI产品信息</el-checkbox>
+        <el-checkbox v-model="configQuery.dbDiProducts"
+          >医疗器械注册人</el-checkbox
         > -->
           </el-descriptions-item>
         </el-descriptions>
@@ -871,6 +906,9 @@ export default {
         udiCodeLost: null,
         udiCodeRel: null,
         orderInvoice: null,
+        deviceInfo: null,
+        deviceCheck: null,
+        deviceRepairApply: null,
       },
       checkedBusTypes: [],
       checkedToInBusTypes: [],