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

src/components/PopDialog/organization.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog
-      title="采购组织选择"
+      :title="type == '1' ? '采购组织选择' : '业务部门选择'"
       width="500px"
       :close-on-click-modal="false"
       :append-to-body="true"
@@ -61,6 +61,7 @@ export default {
     return {
       loading: false,
       visible: false,
+      type: '1',
       filterText: '',
       threedata: [],
       defaultProps: {
@@ -84,6 +85,7 @@ export default {
       this.visible = true;
       this.$nextTick(() => {
         console.log('接收参数了吗', val)
+        this.type = val
         this.refreshList(val)
       });
     },

src/views/material/changeApply/add.vue

@@ -47,27 +47,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="一级分类" prop="oneClass">
-                <el-input readonly :disabled="disable" v-model="basicForm.oneClass"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="二级分类" prop="twoClass">
-                <el-input readonly :disabled="disable" v-model="basicForm.twoClass"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="三级分类" prop="threeClass">
-                <el-input readonly :disabled="disable" v-model="basicForm.threeClass"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="四级分类" prop="fourClass">
+              <el-form-item label="物料分类" prop="materialClassifyId">
                 <el-input readonly :disabled="disable" v-model="basicForm.fourClass">
                   <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="chooseFourClass"></el-button>
                 </el-input>
+                <el-input v-show="false" readonly :disabled="disable" v-model="basicForm.materialClassifyId"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -157,6 +141,29 @@
                 <el-input :disabled="disable" v-model="basicForm.remark"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="一级分类" prop="oneClass">
+                <el-input readonly disabled v-model="basicForm.oneClass"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="二级分类" prop="twoClass">
+                <el-input readonly disabled v-model="basicForm.twoClass"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="三级分类" prop="threeClass">
+                <el-input readonly disabled v-model="basicForm.threeClass"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="四级分类" prop="fourClass">
+                <el-input readonly disabled v-model="basicForm.fourClass">
+                </el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
       </el-tab-pane>
@@ -410,6 +417,7 @@ export default {
         materialId:'',
         materialCode: '',
         materialName: '',
+        materialClassifyId: '',
         medicineMaterial: '2',
         oneClass: '',
         twoClass: '',
@@ -454,11 +462,8 @@ export default {
       basicRules: {
         materialCode: [{  required: true, message: '请选择物料编码', trigger: 'blur' }],
         materialName: [{required: true, message: '请填写物料名称', trigger: 'blur'}],
-        oneClass: [{required: true, message: '请填写一级分类', trigger: 'blur'}],
-        twoClass: [{required: true, message: '请填写二级分类', trigger: 'blur'}],
-        threeClass: [{required: true, message: '请填写三级分类', trigger: 'blur'}],
-        fourClass: [{required: true, message: '请选择四级分类', trigger: 'blur'}],
         specification: [{required: true, message: '请填写规格', trigger: 'blur'}],
+        materialClassifyId: [{required: true, message: '请选择物料分类', trigger: 'blur'}],
         model: [{required: true, message: '请填写型号', trigger: 'blur'}],
         factory: [{required: true, message: '请选择生产厂家/代理人', trigger: 'blur'}],
         registrant: [{required: true, message: '请填写注册人/上市许可持有人', trigger: 'blur'}],
@@ -727,6 +732,7 @@ export default {
     // 选择四级分类
     acceptFourClass(selections) {
       console.log('收到的四级分类',selections)
+      this.basicForm.materialClassifyId = selections.id
       this.getTreeDetails(selections.id)
     },
     // 四级分类显示列表

src/views/material/changeApply/index.vue

@@ -208,13 +208,13 @@ export default {
     },
     // 表格内状态栏判断值
     statusJug(row) {
-      if (row.status === 0) {
+      if (row.status == 0) {
         return '未提交'
-      } else if (row.status === 1) {
+      } else if (row.status == 1) {
         return '审批中'
-      } else if (row.status === 2) {
+      } else if (row.status == 2) {
         return '已完成'
-      } else if (row.status === 3) {
+      } else if (row.status == 3) {
         return '已驳回'
       }
     },

src/views/material/requisition/index.vue

@@ -191,13 +191,13 @@ export default {
     },
     // 表格内状态栏判断值
     statusJug(row) {
-      if (row.status === 0) {
+      if (row.status == 0) {
         return '未提交'
-      } else if (row.status === 1) {
+      } else if (row.status == 1) {
         return '审批中'
-      } else if (row.status === 2) {
+      } else if (row.status == 2) {
         return '已完成'
-      } else if (row.status === 3) {
+      } else if (row.status == 3) {
         return '已驳回'
       }
     },