Browse Source

bug处理

ljb 5 months ago
parent
commit
7f1a4e3a80

+ 15 - 0
src/option/yfCostManage/basicDataSetting/pickingDetail.js

@@ -153,6 +153,11 @@ export default {
       width: 80,
       align: 'center',
       showOverflowTooltip: true,
+      rules: [{
+        required: true,
+        message: '请输入单位',
+        trigger: 'blur',
+      }]
     },
     {
       label: '单价(元)',
@@ -164,6 +169,11 @@ export default {
       min: 0,
       precision: 2,
       showOverflowTooltip: true,
+      rules: [{
+        required: true,
+        message: '请输入单价',
+        trigger: 'blur',
+      }]
     },
     {
       label: '领取数量',
@@ -175,6 +185,11 @@ export default {
       min: 0,
       precision: 2,
       showOverflowTooltip: true,
+      rules: [{
+        required: true,
+        message: '请输入领取数量',
+        trigger: 'blur',
+      }]
     },
     {
       label: '金额(元)',

+ 4 - 4
src/views/achievement/other-achievements.vue

@@ -178,10 +178,10 @@ export default window.$crudCommon({
       return newParams;
     },
     validCustom() {
-      if (!isAlphanumericCombination(this.form.cgbh)) {
-        this.$message.warning("成果编号必须是英文字母加数字组合!");
-        return false;
-      }
+      // if (!isAlphanumericCombination(this.form.cgbh)) {
+      //   this.$message.warning("成果编号必须是英文字母加数字组合!");
+      //   return false;
+      // }
       return true;
     },
     addBefore(loading, callback) {

+ 4 - 4
src/views/achievement/technical-standard.vue

@@ -128,10 +128,10 @@ export default window.$crudCommon({
       done();
     },
     validCustom() {
-      if (!isAlphanumericCombination(this.form.zbh)) {
-        this.$message.warning("标准号必须是英文字母加数字组合!");
-        return false;
-      }
+      // if (!isAlphanumericCombination(this.form.zbh)) {
+      //   this.$message.warning("标准号必须是英文字母加数字组合!");
+      //   return false;
+      // }
       return true;
     },
     // addBefore(loading, callback) {

+ 22 - 18
src/views/external-reports/external-manage/high-comp-discount-details.vue

@@ -5,24 +5,28 @@
     </div>
     <div class="doc-page">
       <h3 class="page-title" style="margin: 24px 0 16px">{{ pageTitle }}</h3>
-      <div style="display: flex; margin: 12px 0;">
-        <year-month-select v-model="year" :showMonth="false" style="margin: 0 15px 0 0;"></year-month-select>
-        <el-button
-          type="primary"
-          size="small"
-          @click="handleReady"
-        >
-          读取数据
-        </el-button>
-        <el-button
-          type="warning"
-          size="small"
-          plain
-          icon="el-icon-download"
-          @click="handleExport"
-        >
-          导出
-        </el-button>
+      <div style="display: flex; margin: 12px 0; align-items: center; justify-content: space-between;">
+        <div style="display: flex;">
+          <year-month-select v-model="year" :showMonth="false" style="margin: 0 15px 0 0;"></year-month-select>
+          <el-button
+            type="primary"
+            size="small"
+            @click="handleReady"
+          >
+            读取数据
+          </el-button>
+          <el-button
+            type="warning"
+            size="small"
+            plain
+            icon="el-icon-download"
+            @click="handleExport"
+          >
+            导出
+          </el-button>
+        </div>
+        
+        <div>单位:元</div>
       </div>
       <table>
         <tbody>

+ 1 - 1
src/views/external-reports/external-manage/jjkc-discount-details.vue

@@ -29,7 +29,7 @@
           <tr>
             <th width="50px">行次</th>
             <th>指标项目名称</th>
-            <th width="25%">金额(数量)</th>
+            <th width="25%">金额()</th>
           </tr>
         </thead>
         <tbody>

+ 3 - 3
src/views/project-manage/components/apply-form.vue

@@ -515,9 +515,9 @@ export default {
         this.loading = false;
         if (data.code == 200) {
           let beanData = { ...data.data };
-          beanData.xmfzr = beanData.xmfzr.toString();
-          beanData.yqcgxs = beanData.yqcgxs.split(",");
-          beanData.xmjsjjmb = beanData.xmjsjjmb.split(",");
+          beanData.xmfzr = beanData.xmfzr ? beanData.xmfzr.toString() : '';
+          beanData.yqcgxs = beanData.yqcgxs ? beanData.yqcgxs.split(",") : [];
+          beanData.xmjsjjmb = beanData.xmjsjjmb  ? beanData.xmjsjjmb.split(",") : [];
           beanData.lxpw = beanData.lxpw ? JSON.parse(beanData.lxpw) : [];
           beanData.lxbg = beanData.lxbg ? JSON.parse(beanData.lxbg) : [];
           beanData.qtzl = beanData.qtzl ? JSON.parse(beanData.qtzl) : [];

+ 6 - 0
src/views/yf-cost-manage/basic-data-setting/picking-detail.vue

@@ -136,6 +136,12 @@ export default window.$crudCommon({
       if (this.form.code && !isAlphanumericCombination(this.form.code)) {
         this.$message.warning("物质编号必须是英文字母加数字组合!");
         return false;
+      } else if (this.form.unitPrice <= 0) {
+        this.$message.warning("单价必须大于0!")
+        return false;
+      } else if (this.form.useQuantity <= 0) {
+        this.$message.warning("领取数量必须大于0!")
+        return false;
       }
       return true;
     },