Merge branch 'dev' into 'master'

Dev

See merge request new-business/drp-web!14

src/views/material/changeApply/index.vue

@@ -98,7 +98,7 @@
       >
         <!-- <el-table-column type="selection" width="55" /> -->
         <el-table-column label="序号" align="center" type="index" width="50" />
-        <el-table-column label="申请组织" align="center" width="200" prop="orgId" />
+        <el-table-column label="所属组织" align="center" width="200" prop="orgId" />
         <el-table-column label="单据编码" align="center" width="200" prop="code" />
         <el-table-column label="申请时间" align="center" width="150" prop="createTime" />
         <el-table-column label="单据状态" align="center" prop="status" :formatter="statusJug" />

src/views/material/requisition/add.vue

@@ -492,7 +492,7 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="中包装数" prop="mediumPackageQty">
-                <el-input :disabled="disable" v-model="basicForm.mediumPackageQty"></el-input>
+                <el-input type="number" min="0" :disabled="disable" v-model="basicForm.mediumPackageQty"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">

src/views/material/requisition/index.vue

@@ -81,7 +81,7 @@
       >
         <!-- <el-table-column type="selection" width="55" /> -->
         <el-table-column label="序号" align="center" type="index" width="50"/>
-        <el-table-column label="申请组织" align="center" width="200" prop="orgName" />
+        <el-table-column label="所属组织" align="center" width="200" prop="orgName" />
         <el-table-column label="单据编码" align="center" width="200" prop="billCode" />
         <el-table-column label="申请人" align="center" prop="createName" />
         <el-table-column label="申请时间" align="center" width="150" prop="createTime" />

src/views/monitor/job/index.vue

@@ -187,8 +187,8 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="超时时间" prop="timeout" >
-              <el-input v-model="form.timeout" placeholder="请输入超时时间" />
+            <el-form-item label="超时限制" prop="timeout" >
+              <el-input v-model="form.timeout" placeholder="请输入超时限制" />
             </el-form-item>
           </el-col>
 
@@ -445,6 +445,30 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        duration: [
+          { required: true, message: "不能为空", trigger: "blur" }
+        ],
+        dispc: [
+          { required: true, message: "不能为空", trigger: "blur" }
+        ],
+        jobTypeS: [
+          { required: true, message: "不能为空", trigger: "blur" }
+        ],
+        jobType: [
+          { required: true, message: "不能为空", trigger: "blur" }
+        ],
+        jobGroup: [
+          { required: true, message: "不能为空", trigger: "blur" }
+        ],
+        timeout: [
+          { required: true, message: "不能为空", trigger: "blur" }
+        ],
+        cont: [
+          { required: true, message: "不能为空", trigger: "blur" }
+        ],
+        empno: [
+          { required: true, message: "不能为空", trigger: "blur" }
+        ],
         jobName: [
           { required: true, message: "名称不能为空", trigger: "blur" }
         ],