入院物资申请问题，新增物价类别，新增单据类型预验收带回

src/api/thrsys/thrHsfl.js

@@ -0,0 +1,9 @@
+import axios from "@/utils/request";
+
+export function getHslbs(query) {
+  return axios({
+    url: "/udiwms/thrsys/getHslbs",
+    method: "get",
+    params: query
+  });
+}

src/assets/styles/ruoyi.scss

@@ -367,7 +367,7 @@
 .el-form-item {
   margin-right: 10px;
   margin-bottom: 1px;
-  margin-top: -5px;
+  margin-top: 1px;
 }
 
 

src/views/basic/busType/bussinessType.vue

@@ -319,6 +319,8 @@ export default {
         checkExpire: true, //校验过期
         checkCertExpire: false, //校验证书过期
         editType: 2,
+        inPreInBack: 1,
+
       },
       enableMap: {
         true: "是",
@@ -589,6 +591,7 @@ export default {
         editType: 2,
         backPreinType: 1,
         sortNum: 999,
+        inPreInBack: 1,
       };
       this.addDialogVisible = true;
     },

src/views/basic/busType/bussinessTypeModify.vue

@@ -198,14 +198,23 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="11">
+          <el-form-item label="单据编辑状态" prop="prefix">
+            <el-select v-model="inputQuery.editType" style="width: 90%" placeholder="编辑状态">
+              <el-option label="仅查看" :value="1"></el-option>
+              <el-option label="可编辑" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row type="flex">
+
         <el-col :span="11">
           <el-form-item prop="remark" label="备注">
             <el-input v-model="inputQuery.remark" size="small" style="width: 90%" type="textarea" autosize
             ></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row type="flex">
 
       </el-row>
     </el-form>
@@ -307,6 +316,23 @@
             </el-col>
           </el-row>
           <el-divider></el-divider>
+          <el-row v-if="inputQuery.actionType==2">
+            <el-col span="5">
+              <span class="sptext">预验收是否带回</span>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="5">
+              <el-select v-model="inputQuery.inPreInBack" style="width: 65%;margin-top: 4px" placeholder="是否带回">
+                <el-option label="带回" :value=1></el-option>
+                <el-option label="不带回" :value=2></el-option>
+              </el-select>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="13">
+              <span class="sptext">预验收是否带回</span>
+            </el-col>
+          </el-row>
+          <el-divider></el-divider>
         </el-collapse-item>
 
         <el-collapse-item title="出库单据设置" v-if="inputQuery.mainAction!='WareHouseIn'">

src/views/basic/product/SelectDIDetailDialog.vue

@@ -499,7 +499,7 @@ export default {
   created() {
     //获取产品标识列表
     let ttquery = {
-      uuid: this.editQuery.uuid,
+      originUuid: this.editQuery.uuid,
     };
     this.getDetailList(ttquery);
   },

src/views/basic/product/productEdit.vue

@@ -252,12 +252,26 @@
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
             <el-form-item :label="productRemarkSet.remarkTitle8+':'">
-              <el-input
-                style="width: 80%"
-                size="small"
-                splaceholder="请输入内容"
+              <el-select
                 v-model="editQuery.basicPrductRemak8"
-              ></el-input>
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择物价类别"
+                :remote-method="findHsflMethod"
+                style="width: 80%"
+              >
+                <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>
             </el-form-item>
           </el-col>
         </el-row>
@@ -578,7 +592,8 @@ import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
 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 {getListMenu, getOneName} from '@/api/basic/basicHospType'
+import {getHslbs} from "@/api/thrsys/thrHsfl";
 
 
 export default {
@@ -637,6 +652,8 @@ export default {
         measname: null,
         nameCode: null
       },
+      loading: false,
+      hsflOptions: [],
     }
   },
   components: {
@@ -655,6 +672,9 @@ export default {
       id: this.relevanceEdit.id
     }
     this.getDetailList(ttquery);
+    if (this.editQuery.basicPrductRemak8 != null) {
+      this.findHsflMethod(this.editQuery.basicPrductRemak8);
+    }
   },
   methods: {
     diableChange() {
@@ -849,11 +869,11 @@ export default {
       }
     },
     getTreeselect() {
-      getOneName().then(res =>{
-        const menu = {id: res.data.id,code:res.data.code, name: res.data.name, children: []};
+      getOneName().then(res => {
+        const menu = {id: res.data.id, code: res.data.code, name: res.data.name, children: []};
         getListMenu({}).then(response => {
           this.fromDeptOptions = [];
-          menu.children = this.handleTree(response.data,"code", "parentCode");
+          menu.children = this.handleTree(response.data, "code", "parentCode");
           console.log(menu)
           this.fromDeptOptions.push(menu);
         });
@@ -870,6 +890,24 @@ export default {
         children: node.children
       };
     },
+    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;
+        });
+    }
+    ,
+
   }
 }
 </script>

src/views/purchase/manufacturer/supManufacturerEditDialog.vue

@@ -73,7 +73,7 @@
               <el-input
                 size="small"
                 placeholder="请输入生产企业"
-                v-model="inputQuery.companyName"
+                v-model.trim="inputQuery.companyName"
                 @input="change()"
               ></el-input>
             </el-form-item>

src/views/supplier/company/basicCompanyproductEdit.vue

@@ -162,12 +162,26 @@
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
             <el-form-item :label="productRemarkSet.remarkTitle8+':'">
-              <el-input
-                style="width: 80%"
-                size="small"
-                splaceholder="请输入内容"
+              <el-select
                 v-model="editQuery.basicPrductRemak8"
-              ></el-input>
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择物价类别"
+                :remote-method="findHsflMethod"
+                style="width: 80%"
+              >
+                <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>
             </el-form-item>
           </el-col>
         </el-row>
@@ -231,6 +245,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";
 
 export default {
   name: 'productEdit',
@@ -277,6 +292,7 @@ export default {
       },
       editSingleDiDialogVisible: false,
       selectErpDialogVisible: false,  //选入ERP产品
+      hsflOptions: [],
     }
   },
 
@@ -297,7 +313,14 @@ export default {
         isDateBy: this.editQuery.isDateBy,
         relSupId: this.editQuery.id,
         groupBuy: this.editQuery.groupBuy,
-        uid: this.editQuery.uid,
+        basicPrductRemak1: this.editQuery.basicPrductRemak1,
+        basicPrductRemak2: this.editQuery.basicPrductRemak2,
+        basicPrductRemak3: this.editQuery.basicPrductRemak3,
+        basicPrductRemak4: this.editQuery.basicPrductRemak4,
+        basicPrductRemak5: this.editQuery.basicPrductRemak5,
+        basicPrductRemak6: this.editQuery.basicPrductRemak6,
+        basicPrductRemak7: this.editQuery.basicPrductRemak7,
+        basicPrductRemak8: this.editQuery.basicPrductRemak8,
       }
 
       updateById(data).then(res => {
@@ -407,6 +430,25 @@ export default {
       this.selectVersionVisible = false;
       this.getThirdSysDetail();
     },
+
+    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;
+        });
+    }
+    ,
+
   },
   components: {
     selectErp
@@ -419,6 +461,10 @@ export default {
       limit: 10,
     };
     this.getDetailList(ttquery);
+    if (this.editQuery.basicPrductRemak8 != null) {
+      this.findHsflMethod(this.editQuery.basicPrductRemak8);
+    }
+
   },
 }
 </script>

src/views/supplier/products/supAddDiProductSelectUdi.vue

@@ -257,8 +257,27 @@
 
           <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8">
             <el-form-item :label="productRemarkSet.remarkTitle8">
-              <el-input style="width: 65%" size="small" splaceholder="请输入内容"
-                        v-model="editQuery.basicPrductRemak8"></el-input>
+              <el-select
+                v-model="editQuery.basicPrductRemak8"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择物价类别"
+                :remote-method="findHsflMethod"
+                :loading="loading"
+                style="width: 65%"
+              >
+                <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>
             </el-form-item>
           </el-col>
         </el-row>
@@ -291,6 +310,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";
 
 export default {
   name: 'closeDialog',
@@ -371,8 +391,8 @@ export default {
       thirdSys: [],
       curSelectDi: null,
       selectThirdSys: [],
-      productRemarkSet: {}
-
+      productRemarkSet: {},
+      hsflOptions: [],
     }
   },
   methods: {
@@ -594,7 +614,24 @@ 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;
+        });
     }
+    ,
 
   },
   created() {

src/views/supplier/products/supDiProductsCheck.vue

@@ -303,7 +303,7 @@ export default {
       }
 
       if (row.type == 1) {
-        let query = {uuid: row.uuid}
+        let query = {devKey: row.deviceRecordKey}
         getDiProductDetail(query).then((res) => {
           if (res.code === 20000) {
             this.thisData = res.data

src/views/supplier/products/supProductsAddDi.vue

@@ -323,7 +323,7 @@ export default {
     },
     detail(row) {
       if (row.type == 1) {
-        let query = { uuid: row.uuid };
+        let query = {devKey: row.deviceRecordKey}
         getDiProductDetail(query).then((res) => {
           if (res.code === 20000) {
             this.delect = row;

src/views/supplier/products/supProductsDetail.vue

@@ -4,7 +4,7 @@
             <div v-if="!isImport" style="margin-bottom: 20px">
               <el-form :model="data" size="mini" label-width="150px">
 
-                <el-row v-if="data.isAudit==2" type="flex" justify="end">
+                <el-row v-if="data.isAudit!=null && data.isAudit==2" type="flex" justify="end">
                   <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -10px">
                     <el-button type="primary" @click="checkPass(2)">通过</el-button>
                     <el-button type="primary" @click="checkPass(3)">不通过</el-button>