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

src/views/material/changeApply/add.vue

@@ -2,7 +2,7 @@
   <div class="apply_add">
     <el-tabs type="border-card" v-model="tabValue" @tab-click="handleClick">
       <el-tab-pane label="基本信息" name="first">
-        <el-form :model="basicForm" :rules="basicRules" ref="basic" label-width="160px">
+        <el-form :model="basicForm" :rules="basicRules" ref="basic" label-width="170px">
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="单据编码" prop="code">
@@ -146,7 +146,7 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="交货周期" prop="leadTime">
-                <el-input :disabled="disable" v-model="basicForm.leadTime"></el-input>
+                <el-input type="number" :disabled="disable" v-model="basicForm.leadTime"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -272,18 +272,18 @@
         <el-form :model="basicForm" ref="info" label-width="160px">
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item label="申请人" prop="createBy">
-                <el-input disabled v-model="basicForm.createBy"></el-input>
+              <el-form-item label="申请人" prop="createByName">
+                <el-input disabled v-model="basicForm.createByName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="申请时间" prop="applicationTime">
-                <el-input disabled v-model="basicForm.applicationTime"></el-input>
+              <el-form-item label="申请时间" prop="createTime">
+                <el-input disabled v-model="basicForm.createTime"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="创建人" prop="createBy">
-                <el-input disabled v-model="basicForm.createBy"></el-input>
+              <el-form-item label="创建人" prop="createByName">
+                <el-input disabled v-model="basicForm.createByName"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -294,8 +294,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="最后修改人" prop="updateBy">
-                <el-input disabled v-model="basicForm.updateBy"></el-input>
+              <el-form-item label="最后修改人" prop="updateByName">
+                <el-input disabled v-model="basicForm.updateByName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -317,7 +317,19 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="单据状态" prop="status">
-                <el-input disabled v-model="basicForm.status"></el-input>
+                <el-select 
+                  v-model="basicForm.status"
+                  size="small"
+                  disabled
+                  >
+                  <el-option
+                    v-for="item in statusOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+                <!-- <el-input disabled v-model="basicForm.status"></el-input> -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -414,7 +426,30 @@ export default {
         value: '2',
         label: '否'
       }],
-      basicRules: {},
+      statusOptions: [{
+        value: 0, label: '未提交'
+      },{
+        value: 1, label: '审批中'
+      },{
+        value: 2, label: '已完成'
+      },{
+        value: 3, label: '已驳回'
+      },],
+      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'}],
+        model: [{required: true, message: '请填写四级分类', trigger: 'blur'}],
+        factory: [{required: true, message: '请选择生产厂家/代理人', trigger: 'blur'}],
+        registrant: [{required: true, message: '请填写注册人/上市许可持有人', trigger: 'blur'}],
+        storageConditions: [{required: true, message: '请选择存储条件', trigger: 'blur'}],
+        transportCondition: [{required: true, message: '请选择运输条件', trigger: 'blur'}],
+        leadTime: [{required: true, message: '请填写交货周期', trigger: 'blur'}],
+      },
       basicForm2: {
         drug: '',
         registrationNo: '',
@@ -514,13 +549,17 @@ export default {
       let sparams = {...this.basicForm, ...{status: 0}}
       sparams.medicineChange = this.basicForm2
       console.log('保存参数', sparams)
-      addChangeList(sparams).then(res => {
-        if(res.code === 200) {
-          this.$message({
-            message: res.msg,
-            type: 'success'
-          });
-          this.back()
+      this.$refs['basic'].validate((valid) => {
+        if (valid) {
+          addChangeList(sparams).then(res => {
+            if(res.code === 200) {
+              this.$message({
+                message: res.msg,
+                type: 'success'
+              });
+              this.back()
+            }
+          })
         }
       })
     },
@@ -529,13 +568,17 @@ export default {
       let sparams = {...this.basicForm, ...{status: 1}}
       sparams.medicineChange = this.basicForm2
       console.log('提交参数', sparams)
-      editChangeList(sparams).then(res => {
-        if(res.code === 200) {
-          this.$message({
-            message: res.msg,
-            type: 'success'
-          });
-          this.back()
+      this.$refs['basic'].validate((valid) => {
+        if(valid) {
+          editChangeList(sparams).then(res => {
+            if(res.code === 200) {
+              this.$message({
+                message: res.msg,
+                type: 'success'
+              });
+              this.back()
+            }
+          })
         }
       })
     },

src/views/material/requisition/add.vue

@@ -3,7 +3,7 @@
     <el-tabs type="border-card" v-model="tabValue" @tab-click="handleClick">
       <el-tab-pane label="基本信息" name="first">
         <div style="width: 100%;height: 680px;overflow-y: auto; overflow-x: hidden;">
-        <el-form :model="basicForm" :rules="basicRules" ref="basic" label-width="160px">
+        <el-form :model="basicForm" :rules="basicRules" ref="basic" label-width="170px">
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="单据编码" prop="billCode">
@@ -684,18 +684,18 @@
         <el-form :model="basicForm" ref="info" label-width="160px">
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item label="申请人" prop="createBy">
-                <el-input disabled v-model="basicForm.createBy"></el-input>
+              <el-form-item label="申请人" prop="createName">
+                <el-input disabled v-model="basicForm.createName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="申请时间" prop="applicationTime">
-                <el-input disabled v-model="basicForm.applicationTime"></el-input>
+              <el-form-item label="申请时间" prop="createTime">
+                <el-input disabled v-model="basicForm.createTime"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="创建人" prop="createByName">
-                <el-input disabled v-model="basicForm.createByName"></el-input>
+              <el-form-item label="创建人" prop="createName">
+                <el-input disabled v-model="basicForm.createName"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -706,8 +706,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="最后修改人" prop="updateByName">
-                <el-input disabled v-model="basicForm.updateByName"></el-input>
+              <el-form-item label="最后修改人" prop="updateName">
+                <el-input disabled v-model="basicForm.updateName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -729,7 +729,19 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="单据状态" prop="status">
-                <el-input disabled v-model="basicForm.status"></el-input>
+                <el-select 
+                  v-model="basicForm.status"
+                  size="small"
+                  disabled
+                  >
+                  <el-option
+                    v-for="item in statusOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+                <!-- <el-input disabled v-model="basicForm.status"></el-input> -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -937,6 +949,15 @@ export default {
         value: '2',
         label: '否'
       }],
+      statusOptions: [{
+        value: 0, label: '未提交'
+      },{
+        value: 1, label: '审批中'
+      },{
+        value: 2, label: '已完成'
+      },{
+        value: 3, label: '已驳回'
+      },],
       basicRules: {
         classifyId: [{  required: true, message: '请选择四级分类', trigger: 'change' }],
         name: [{required: true, message: '请输入物料名称', trigger: 'blur'}],