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

src/api/requisition/basic.js

@@ -37,4 +37,13 @@ export function delReq(id) {
     url: `/system/apply/material/${id}`,
     method: 'delete',
   })
-}
+}
+
+// 参照-四级分类
+// export function getMaterialClass(data) {
+//   return request({
+//     url: `/system/archival/queryMaterialClassify`,
+//     method: 'post',
+//     data: data
+//   })
+// }

src/components/PopDialog/fourClass.vue

@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <el-dialog
+      title="物料分类选择"
+      width="1000px"
+      :close-on-click-modal="false"
+      :append-to-body="true"
+      v-dialogDrag
+      class="userDialog"
+      :visible.sync="visible"
+    >
+      <el-container style="height: 500px">
+        <el-container>
+          <el-main>
+            <el-row :gutter="10" class="content">
+              <el-col :span="12">
+                <el-input
+                  placeholder="输入关键字进行过滤"
+                  size="small"
+                  v-model="filterText">
+                </el-input>
+
+                <el-tree
+                  class="filter-tree"
+                  :data="threedata"
+                  :props="defaultProps"
+                  show-checkbox
+                  node-key="id"
+                  :default-checked-keys="[1711]"
+                  @node-click="clickTree"
+                  :filter-node-method="filterNode"
+                  ref="tree">
+                </el-tree>
+              </el-col>
+            </el-row>
+          </el-main>
+        </el-container>
+      </el-container>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          size="small"
+          @click="visible = false"
+          icon="el-icon-circle-close"
+          >关闭</el-button
+        >
+        <el-button
+          size="small"
+          type="primary"
+          icon="el-icon-circle-check"
+          @click="doSubmit()"
+          >确定</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getTree } from '@/api/classify/basic';
+export default {
+  data() {
+    return {
+      loading: false,
+      visible: false,
+      filterText: '',
+      threedata: [],
+      defaultProps: {
+        children: 'childrens',
+        label: 'materialType'
+      },
+      // 判断是否为最末级节点
+      isLast: false,
+      // 选中的节点
+      choosePoint: {}
+    };
+  },
+  props: {},
+  methods: {
+    init() {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.refreshList()
+      });
+    },
+    // 获取数据列表
+    refreshList(data) {
+      this.loading = true;
+      getTree(data).then(res => {
+        console.log('res',res)
+        if(res.code === 200) {
+          this.threedata = res.rows
+        }
+        this.loading = false;
+      });
+    },
+    clickTree(data) {
+      console.log('树形节点信息：',data)
+      if (data.childrens.length == 0) {
+        this.isLast = true
+      } else {
+        this.isLast = false
+      }
+      this.choosePoint = data
+    },
+    filterNode(value, data) {
+      console.log('value', value)
+      console.log('data', data)
+        if (!value) return true;
+        return data.label.indexOf(value) !== -1;
+    },
+    doSubmit() {
+      if(this.isLast == false) {
+        this.$message({
+          message: '请选择最末级节点',
+          type: 'warning'
+        });
+      } else {
+        console.log('子组件选择的数据',this.choosePoint)
+        this.$emit("doSubmit", this.choosePoint);
+        this.visible = false;
+      }
+    },
+  },
+};
+</script>
+<style lang="scss">
+.userDialog {
+  .el-dialog__body {
+    padding: 10px 0px 0px 10px;
+    color: #606266;
+    font-size: 14px;
+    word-break: break-all;
+  }
+  .el-main {
+    padding: 20px 20px 5px 20px;
+    .el-pagination {
+      margin-top: 5px;
+    }
+  }
+}
+</style>

src/views/material/changeApply/add.vue

@@ -469,7 +469,9 @@ export default {
       getChangeDetails(row.id).then(res => {
         if(res.code === 200) {
           this.basicForm = res.data
-          this.basicForm2 = res.data.medicineChange
+          if (res.data.medicineChange) {
+            this.basicForm2 = res.data.medicineChange
+          }
         }
       })
     },

src/views/material/changeApply/index.vue

@@ -48,12 +48,12 @@
       <el-col :span="1.5">
         <el-button type="primary" size="small" plain @click="newAdd">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="primary" size="small" plain>导入</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="primary" size="small" plain>导出</el-button>
-      </el-col>
+      </el-col> -->
       <!-- <el-col :span="1.5">
         <el-button type="primary" size="small" plain>批量提交</el-button>
       </el-col>

src/views/material/classify/index.vue

@@ -10,12 +10,12 @@
       <el-col :span="1.5">
         <el-button type="primary" size="small" plain @click="deleteClassify">删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="primary" size="small" plain>启用</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="primary" size="small" plain>停用</el-button>
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-card>

src/views/material/requisition/add.vue

@@ -17,8 +17,22 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="四级分类" prop="classifyId">
+                <el-select
+                    ref="fourTag"
+                    v-model="basicForm.classifyId"
+                    placeholder="四级分类"
+                    :disabled="disable"
+                    @focus="chooseFourClass"
+                  >
+                    <el-option
+                      v-for="item in testOptions"
+                      :key="item.id"
+                      :label="item.materialType"
+                      :value="item.id"
+                    />
+                </el-select>
                 <el-input :disabled="disable" v-model="basicForm.classifyId">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test01"></el-button>
+                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="chooseFourClass"></el-button>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -38,7 +52,7 @@
                       :label="item.label"
                       :value="item.value"
                     />
-                  </el-select>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -98,7 +112,9 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="产地" prop="originPlace">
-                <el-input :disabled="disable" v-model="basicForm.originPlace"></el-input>
+                <el-input :disabled="disable" v-model="basicForm.originPlace">
+                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test02"></el-button>
+                </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -250,72 +266,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="近效期预警天数" prop="recentWarningPeriod">
-                <el-select
-                    v-model="basicForm.recentWarningPeriod"
-                    placeholder="近效期预警天数"
-                    clearable
-                    :disabled="disable"
-                  >
-                    <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="有效期单位" prop="expiryUnitId">
-                <el-select
-                    v-model="basicForm.expiryUnitId"
-                    placeholder="有效期单位"
-                    clearable
-                    :disabled="disable"
-                  >
-                    <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="有效期至单位" prop="usefulLifeUnitId">
-                <el-select
-                    v-model="basicForm.usefulLifeUnitId"
-                    placeholder="有效期至单位"
-                    clearable
-                    :disabled="disable"
-                  >
-                    <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="近效期预警天数" prop="recentWarningPeriod">
-                <el-select
-                    v-model="basicForm.recentWarningPeriod"
-                    placeholder="近效期预警天数"
-                    clearable
-                    :disabled="disable"
-                  >
-                    <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                </el-select>
+                <el-input :disabled="disable" v-model="basicForm.recentWarningPeriod"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -329,7 +280,7 @@
                     :disabled="disable"
                   >
                     <el-option
-                      v-for="item in options"
+                      v-for="item in dict.type.sys_storage_condition"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
@@ -346,7 +297,7 @@
                     :disabled="disable"
                   >
                     <el-option
-                      v-for="item in options"
+                      v-for="item in dict.type.sys_conditions_carriage"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
@@ -356,26 +307,16 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="物料税类" prop="materialRate">
-                <el-input :disabled="disable" v-model="basicForm.materialRate"></el-input>
+                <el-input :disabled="disable" v-model="basicForm.materialRate">
+                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test02"></el-button>
+                </el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="交货周期" prop="deliveryPeriod">
-                <el-select
-                    v-model="basicForm.deliveryPeriod"
-                    placeholder="交货周期"
-                    clearable
-                    :disabled="disable"
-                  >
-                    <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                </el-select>
+                <el-input :disabled="disable" v-model="basicForm.deliveryPeriod"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -392,7 +333,9 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="采购员" prop="puPersonnelId">
-                <el-input :disabled="disable" v-model="basicForm.puPersonnelId"></el-input>
+                <el-input :disabled="disable" v-model="basicForm.puPersonnelId">
+                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test02"></el-button>
+                </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -436,7 +379,9 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="业务线" prop="businessLine">
-                <el-input :disabled="disable" v-model="basicForm.businessLine"></el-input>
+                <el-input :disabled="disable" v-model="basicForm.businessLine">
+                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test02"></el-button>
+                </el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -477,24 +422,24 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="一级分类" prop="oneClass">
-                <el-input :disabled="disable" v-model="basicForm.oneClass"></el-input>
+                <el-input disabled v-model="basicForm.oneClass"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="二级分类" prop="twoClass">
-                <el-input :disabled="disable" v-model="basicForm.twoClass"></el-input>
+                <el-input disabled v-model="basicForm.twoClass"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="三级分类" prop="threeClass">
-                <el-input :disabled="disable" v-model="basicForm.threeClass"></el-input>
+                <el-input disabled v-model="basicForm.threeClass"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="启用状态" prop="isEnable">
-                <el-input :disabled="disable" v-model="basicForm.isEnable"></el-input>
+                <el-input disabled v-model="basicForm.isEnable"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -563,7 +508,9 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="剂型" prop="dosageFrom">
-                <el-input :disabled="disable" v-model="basicForm2.dosageFrom"></el-input>
+                <el-input :disabled="disable" v-model="basicForm2.dosageFrom">
+                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test02"></el-button>
+                </el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -575,7 +522,19 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="养护类型" prop="curingType">
-                <el-input :disabled="disable" v-model="basicForm2.curingType"></el-input>
+                <el-select
+                    v-model="basicForm2.curingType"
+                    placeholder="养护类型"
+                    clearable
+                    :disabled="disable"
+                  >
+                    <el-option
+                      v-for="dict in dict.type.curing_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -709,19 +668,30 @@
       :selectData="selectData2"
       :single="true"
     />
+
+    <fourClass
+      ref="fourClass"
+      @doSubmit="acceptFourClass"
+      :selectData="selectData3"
+      :single="true"
+    />
+
+
   </div>
 </template>
 
 <script>
 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'
 export default {
   name: 'requisition_add',
   dicts: ['sys_storage_condition', 'sys_conditions_carriage', 'sys_medicine', 'medical_instruments', 'curing_type'],
   components: {
     popDialog,
-    factory
+    factory,
+    fourClass
   },
   props: ['pageStu', 'row', 'disable'],
   model: {
@@ -730,6 +700,7 @@ export default {
   },
   data() {
     return{
+      testOptions: [],
       tabValue: 'first',
       basicForm: {
         billCode: '',
@@ -827,7 +798,8 @@ export default {
       // 弹窗
       name: '',
       selectData: [],
-      selectData2: []
+      selectData2: [],
+      selectData3: [],
     }
   },
   // watch: {
@@ -893,7 +865,6 @@ export default {
     },
     save() {
       if(this.pageStu == 'edit') {
-        alert(111)
         let sparams = {...this.basicForm, ...{status: 0}}
         sparams.sysMaterialMedcineApply = this.basicForm2
         console.log('提交参数', sparams)
@@ -907,7 +878,6 @@ export default {
           }
         })
       } else {
-        alert(222)
         // alert('保存传status：0')
         let sparams = {...this.basicForm, ...{status: 0}}
         sparams.sysMaterialMedcineApply = this.basicForm2
@@ -1017,7 +987,18 @@ export default {
     },
     selectionsToInput2 (selections) {
       console.log('选择的数据',selections)
-      this.basicForm.factory = selections[0].manufactureName
+      this.basicForm.manufacturerId = selections[0].code
+    },
+    acceptFourClass (selections) {
+      console.log('父组件收到的数据',selections)
+      this.testOptions.push(selections)
+      console.log('收到的数据转成数组', this.testOptions)
+      this.basicForm.classifyId = selections.id
+    },
+    chooseFourClass() {
+      console.log('1111')
+      this.$refs.fourTag.blur()
+      this.$refs.fourClass.init()
     },
     // 显示列表
     test01() {

src/views/material/requisition/index.vue

@@ -48,12 +48,12 @@
       <el-col :span="1.5">
         <el-button type="primary" size="small" plain @click="newAdd">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="primary" size="small" plain>导入</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="primary" size="small" plain>导出</el-button>
-      </el-col>
+      </el-col> -->
       <!-- <el-col :span="1.5">
         <el-button type="primary" size="small" plain>批量提交</el-button>
       </el-col>

vue.config.js

@@ -36,8 +36,13 @@ module.exports = {
     proxy: {
       // 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://172.16.100.107:8080/drp-admin`, //测试
         // target: `http://test-sy.derom.com/drp-admin`, //测试
-        target: `http://172.16.13.47:8000/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`, //石羊本地
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''