长泰选择物资类别修改

.env.production

@@ -22,7 +22,7 @@ ENV = 'production'
 
 # 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.117:9150/UDI_SPMS_SERVER/'
-VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/'
 
 # 漳州中医院
 # VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'
@@ -31,17 +31,17 @@ VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/'
 
 # 长泰医院
-# VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
 
 
 
 # 应用访问路径 例如使用前缀 /admin/
 
 # 域名
-# VUE_APP_CONTEXT_PATH = '/'
+VUE_APP_CONTEXT_PATH = '/'
 
 # 其他
-VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
+# VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
 
 # 监控地址
 VUE_APP_MONITRO_ADMIN = '/admin/login'

src/api/thrsys/thrHsfl.js

@@ -7,3 +7,12 @@ export function getHslbs(query) {
     params: query
   });
 }
+
+
+export function getThrProductType(query) {
+  return axios({
+    url: "/udiwms/thrsys/getThrProductType",
+    method: "get",
+    params: query
+  });
+}

src/views/basic/product/productEdit.vue

@@ -242,12 +242,26 @@
         <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
             <el-form-item :label="productRemarkSet.remarkTitle7+':'">
-              <el-input
+              <el-select
-                style="width: 80%"
-                size="small"
-                splaceholder="请输入内容"
                 v-model="editQuery.basicPrductRemak7"
-              ></el-input>
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择物资类别"
+                :remote-method="findThrTypeMethod"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="item in thrTypeOptions"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
@@ -593,7 +607,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} from "@/api/thrsys/thrHsfl";
+import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
 
 
 export default {
@@ -654,6 +668,7 @@ export default {
       },
       loading: false,
       hsflOptions: [],
+      thrTypeOptions: [],
     }
   },
   components: {
@@ -675,6 +690,9 @@ export default {
     if (this.editQuery.basicPrductRemak8 != null) {
       this.findHsflMethod(this.editQuery.basicPrductRemak8);
     }
+    if (this.editQuery.basicPrductRemak7 != null) {
+      this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
+    }
   },
   methods: {
     diableChange() {
@@ -905,8 +923,23 @@ export default {
         .catch(() => {
           this.loading = false;
         });
-    }
+    },
-    ,
+    findThrTypeMethod(query) {
+      this.thrTypeOptions = [];
+      let cQuery = {
+        key: query,
+        page: 1,
+        limit: 20
+      };
+      getThrProductType(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.thrTypeOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
 
   }
 }

src/views/inout/IoReturnedSearchOrder.vue

@@ -577,6 +577,7 @@ export default {
         mainAction: null,
         action: null,
         vueType: "supReturned",
+        statusType: "supReturned",
         page: 1,
         limit: 10,
         startTime: null,
@@ -717,6 +718,7 @@ export default {
         mainAction: null,
         action: null,
         vueType: "supReturned",
+        statusType: "supReturned",
         page: 1,
         limit: 10,
         startTime: null,

src/views/purchase/product/supProductEditDialog.vue

@@ -550,8 +550,8 @@ export default {
           return;
         }
       }
-      if(val==3){
+      if (val == 3) {
-        this.$confirm( "已审核通过，是否需要重新提交变更", {
+        this.$confirm("已审核通过，是否需要重新提交变更", {
           confirmButtonText: "确定",
           type: "warning",
           showCancelButton: false,
@@ -581,7 +581,7 @@ export default {
               }
             });
           });
-      }else{
+      } else {
         this.$refs['inputQuery'].validate(valid => {
           if (valid) {
             // this.inputQuery.auditStatus = val;
@@ -669,7 +669,7 @@ export default {
       this.imgList = [];
       previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
         if (response.code === 20000) {
-          this.imgList=response.data;
+          this.imgList = response.data;
         }
       });
       this.imgViewerVisible = true;
@@ -703,7 +703,7 @@ export default {
           this.loading = false;
           if (response.code === 20000) {
             this.inputQuery = response.data;
-            this.inputQuery.manufacturerId=this.inputQuery.manufacturerIdFk
+            this.inputQuery.manufacturerId = this.inputQuery.manufacturerIdFk
             this.selectSingleProductVisible = false;
           } else {
             this.$message.error(response.message);

src/views/supplier/company/basicCompanyProductsImport.vue

@@ -206,12 +206,12 @@
           </el-row>
 
           <el-row>
-<!--            <el-col :span="12" class="el-col">-->
+            <!--            <el-col :span="12" class="el-col">-->
-<!--              <el-form-item label="包装级别" prop="bzcj">-->
+            <!--              <el-form-item label="包装级别" prop="bzcj">-->
-<!--                <el-input style="width: 90%" size="small" splaceholder="请输入包装级别" v-model="editQuery.bzcj"-->
+            <!--                <el-input style="width: 90%" size="small" splaceholder="请输入包装级别" v-model="editQuery.bzcj"-->
-<!--                          :disabled="true"></el-input>-->
+            <!--                          :disabled="true"></el-input>-->
-<!--              </el-form-item>-->
+            <!--              </el-form-item>-->
-<!--            </el-col>-->
+            <!--            </el-col>-->
 
             <el-col :span="12" class="el-col">
               <el-form-item label="包含下级包装数量" prop="bhxjsl">
@@ -276,12 +276,12 @@
                 <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.cpms"></el-input>
               </el-form-item>
             </el-col>
-<!--            <el-col :span="12" class="el-col">-->
+            <!--            <el-col :span="12" class="el-col">-->
-<!--              <el-form-item label="计量单位" prop="measname">-->
+            <!--              <el-form-item label="计量单位" prop="measname">-->
-<!--                <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容"-->
+            <!--                <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容"-->
-<!--                          v-model="editQuery.measname"></el-input>-->
+            <!--                          v-model="editQuery.measname"></el-input>-->
-<!--              </el-form-item>-->
+            <!--              </el-form-item>-->
-<!--            </el-col>-->
+            <!--            </el-col>-->
             <el-col :span="12" class="el-col">
               <el-form-item label="最小包装单元内包含使用单元数量" prop="zxxsbzbhsydysl">
                 <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容"
@@ -524,12 +524,26 @@
               <div class="itemTag">
                 <span>{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span>
               </div>
-              <el-input
+              <el-select
-                style="width: 65%"
-                size="small"
-                splaceholder="请输入内容"
                 v-model="repEditQuery.basicPrductRemak7"
-              ></el-input>
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择物资类别"
+                :remote-method="findThrTypeMethod"
+                style="width: 65%"
+              >
+                <el-option
+                  v-for="item in thrTypeOptions"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                </el-option>
+              </el-select>
             </div>
           </el-col>
 
@@ -538,12 +552,27 @@
               <div class="itemTag">
                 <span>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span>
               </div>
-              <el-input
+              <el-select
-                style="width: 65%"
-                size="small"
-                splaceholder="请输入内容"
                 v-model="repEditQuery.basicPrductRemak8"
-              ></el-input>
+                filterable
+                remote
+                style="width: 65%"
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择物价类别"
+                :remote-method="findHsflMethod"
+              >
+                <el-option
+                  v-for="item in hsflOptions"
+                  :key="item.hsbm"
+                  :label="item.hsmc"
+                  :value="item.hsbm"
+                >
+                  <span style="float: left">{{ item.hsmc }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.hsbm }}</span>
+                </el-option>
+              </el-select>
+
             </div>
           </el-col>
         </el-row>
@@ -560,6 +589,7 @@ import {filterByUuid} from "../../../api/basic/udiInfo";
 import {insertCompanyProductRelevance, insertFilter} from "../../../api/basic/companyProductRelevance";
 import store from "../../../store";
 import {isBlank} from "@/utils/strUtil";
+import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
 
 export default {
   name: "UdIInfoSelect",
@@ -599,7 +629,7 @@ export default {
         supplementRequest: null,
       },
       loading: false,
-      editQuery: null,
+      editQuery: {},
       repEditQuery: {
         sptm: null,
         ybbm: null,
@@ -652,6 +682,8 @@ export default {
       selectLocalVisible: false,
       productRemarkSet: {},
       supplementRequest: null,
+      hsflOptions: [],
+      thrTypeOptions: [],
     };
   },
 
@@ -750,6 +782,7 @@ export default {
 
     },
     allExport() {
+      debugger
       this.postQuery.customerId = store.getters.customerId;
       this.postQuery.supplementRequest = this.repEditQuery;
       insertFilter(this.postQuery).then(response => {
@@ -943,6 +976,39 @@ export default {
         }
       });
     },
+    findHsflMethod(query) {
+      this.hsflOptions = [];
+      let cQuery = {
+        key: query,
+        page: 1,
+        limit: 20
+      };
+      getHslbs(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.hsflOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    }
+    ,
+    findThrTypeMethod(query) {
+      this.thrTypeOptions = [];
+      let cQuery = {
+        key: query,
+        page: 1,
+        limit: 20
+      };
+      getThrProductType(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.thrTypeOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
   },
   mounted() {
   },

src/views/supplier/company/basicCompanyproductEdit.vue

@@ -152,12 +152,26 @@
         <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
             <el-form-item :label="productRemarkSet.remarkTitle7+':'">
-              <el-input
+              <el-select
-                style="width: 80%"
-                size="small"
-                splaceholder="请输入内容"
                 v-model="editQuery.basicPrductRemak7"
-              ></el-input>
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择物资类别"
+                :remote-method="findThrTypeMethod"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="item in thrTypeOptions"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
@@ -245,7 +259,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} from "@/api/thrsys/thrHsfl";
+import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
 
 export default {
   name: 'productEdit',
@@ -293,6 +307,7 @@ export default {
       editSingleDiDialogVisible: false,
       selectErpDialogVisible: false,  //选入ERP产品
       hsflOptions: [],
+      thrTypeOptions: [],
     }
   },
 
@@ -446,8 +461,24 @@ export default {
         .catch(() => {
           this.loading = false;
         });
-    }
+    },
-    ,
+
+    findThrTypeMethod(query) {
+      this.thrTypeOptions = [];
+      let cQuery = {
+        key: query,
+        page: 1,
+        limit: 20
+      };
+      getThrProductType(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.thrTypeOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
 
   },
   components: {
@@ -464,6 +495,9 @@ export default {
     if (this.editQuery.basicPrductRemak8 != null) {
       this.findHsflMethod(this.editQuery.basicPrductRemak8);
     }
+    if (this.editQuery.basicPrductRemak7 != null) {
+      this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
+    }
 
   },
 }

src/views/supplier/products/supAddDiProductSelectUdi.vue

@@ -250,8 +250,26 @@
         <el-row>
           <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7">
             <el-form-item :label="productRemarkSet.remarkTitle7 ">
-              <el-input style="width: 65%" size="small" splaceholder="请输入内容"
+              <el-select
-                        v-model="editQuery.basicPrductRemak7"></el-input>
+                v-model="editQuery.basicPrductRemak7"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择物资类别"
+                :remote-method="findThrTypeMethod"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="item in thrTypeOptions"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
 
@@ -310,7 +328,7 @@ import selectDiDetail from './selectDIDetailDialog'
 import store from '@/store'
 import {getBasicThirdSys} from '@/api/basic/basicThirdSys'
 import {finProductSet} from '@/api/param/systemParamConfig'
-import {getHslbs} from "@/api/thrsys/thrHsfl";
+import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
 
 export default {
   name: 'closeDialog',
@@ -393,6 +411,7 @@ export default {
       selectThirdSys: [],
       productRemarkSet: {},
       hsflOptions: [],
+      thrTypeOptions: [],
     }
   },
   methods: {
@@ -630,8 +649,23 @@ export default {
         .catch(() => {
           this.loading = false;
         });
-    }
+    },
-    ,
+    findThrTypeMethod(query) {
+      this.thrTypeOptions = [];
+      let cQuery = {
+        key: query,
+        page: 1,
+        limit: 20
+      };
+      getThrProductType(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.thrTypeOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
 
   },
   created() {