Kaynağa Gözat

Merge branch 'master' of http://172.16.100.139/new-business/drp-web

002390 2 yıl önce
ebeveyn
işleme
8b99e511e9

+ 1 - 2
src/components/PopDialog/fourClass.vue

@@ -24,9 +24,8 @@
                   class="filter-tree"
                   :data="threedata"
                   :props="defaultProps"
-                  show-checkbox
                   node-key="id"
-                  :default-checked-keys="[1711]"
+                  highlight-current
                   @node-click="clickTree"
                   :filter-node-method="filterNode"
                   ref="tree">

+ 1 - 1
src/views/material/changeApply/add.vue

@@ -572,7 +572,7 @@ export default {
           this.basicForm.registrant = data.registrant
           this.basicForm.storageConditions = data.storageCondition
           this.basicForm.transportCondition = data.transportationCondition
-          this.basicForm.remark = data.deliveryPeriod
+          this.basicForm.leadTime = data.deliveryPeriod
           if(data.medcines.length !== 0) {
             this.basicForm2.drug = data.medcines[0].isDrug
             this.basicForm2.registrationNo = data.medcines[0].registrationNo

+ 20 - 2
src/views/material/requisition/add.vue

@@ -31,9 +31,9 @@
                       :value="item.id"
                     />
                 </el-select>
-                <el-input :disabled="disable" v-model="basicForm.classifyId">
+                <!-- <el-input :disabled="disable" v-model="basicForm.classifyId">
                   <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="chooseFourClass"></el-button>
-                </el-input>
+                </el-input> -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -685,6 +685,8 @@ import popDialog from '@/components/PopDialog/index.vue'
 import factory from '@/components/PopDialog/productFactory.vue'
 import fourClass from '@/components/PopDialog/fourClass.vue'
 import { addReq, getReqDetail, editReq } from '@/api/requisition/basic'
+// 调用物料分类详情接口用于数据回显
+import { getDetail } from '@/api/classify/basic';
 export default {
   name: 'requisition_add',
   dicts: ['sys_storage_condition', 'sys_conditions_carriage', 'sys_medicine', 'medical_instruments', 'curing_type'],
@@ -835,11 +837,15 @@ export default {
         console.log('页面状态',this.pageStu)
         console.log('数据', this.row)
         this.getDetails(this.row)
+        // 获取树形详情
+        this.getTreeDetails(this.row.classifyId)
       } else if (this.pageStu == 'edit') {
         // alert('修改页面')
         console.log('页面状态',this.pageStu)
         console.log('数据', this.row)
         this.getDetails(this.row)
+        // 获取树形详情
+        this.getTreeDetails(this.row.classifyId)
       } else if(this.pageStu == 'add') {
         // alert('新增页面')
         console.log('页面状态',this.pageStu)
@@ -851,6 +857,17 @@ export default {
       console.log(tab, event);
       console.log('页面状态',this.pageStu)
     },
+    // 用于回显四级分类树形选择
+    getTreeDetails(id) {
+      getDetail(id).then(res => {
+        if (res.code === 200) {
+          this.testOptions.push(res.data)
+          this.basicForm.oneClass = res.data.oneClass
+          this.basicForm.twoClass = res.data.twoClass
+          this.basicForm.threeClass = res.data.threeClass
+        }
+      })
+    },
     // 如果是详情进入,则调用详情接口
     getDetails(row) {
       getReqDetail(row.id).then(res => {
@@ -994,6 +1011,7 @@ export default {
       this.testOptions.push(selections)
       console.log('收到的数据转成数组', this.testOptions)
       this.basicForm.classifyId = selections.id
+      this.getTreeDetails(selections.id)
     },
     chooseFourClass() {
       console.log('1111')

+ 4 - 2
vue.config.js

@@ -37,10 +37,12 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://172.16.100.107:8080/ruoyi-admin`, //生产
-        // target: `http://test-sy.derom.com/drp-admin`, //测试
+        // target: `http://172.16.100.107:8080/drp-admin`, //测试
+        target: `http://test-sy.derom.com/drp-admin`, //测试
+        // target: `http://172.16.63.202:8000/drp-admin`, // 谁的本地
         // target: `http://172.16.62.241:8000/drp-admin`, //笑寒本地
         // target: `http://172.16.13.152:8000/drp-admin`, //豪哥本地
-        target: `http://172.16.13.47:8000/drp-admin`, //石杨本地
+        // target: `http://172.16.13.47:8000/drp-admin`, //石杨本地
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''