imeik-bizui 0.7.2 → 0.7.4

package/dist/bizui/src/FieldApplyTypeView/data.js

@@ -83,11 +83,12 @@ const typeItems = {
       type: 'ImInput',
       prop: 'promiseTarget',
       label: '承诺目标',
+      span: 24,
       rules: [{ required: true, message: '请输入承诺目标' }],
       attrs: {
         type: 'textarea',
         rows: 4,
-        maxlength: 5000,
+        maxlength: 500,
         'show-word-limit': true,
         placeholder: '注明：在上述时间断内可完成多少提货'
       }

package/dist/bizui/src/FieldMaterialSelect/components/ProductList.vue

@@ -13,7 +13,16 @@
       <template slot="materialCountInfo" slot-scope="{ row }">
         <div class="flex countView">
           <!-- <span class="materialCount">申请数量：</span> -->
-          <el-input v-if="!isView" v-model="row.materialQuantity" type="number" style="margin-right: 30px" :min="0" placeholder="请输入数量" @input="handleInput(row)"></el-input>
+          <el-input
+            v-if="!isView"
+            v-model="row.materialQuantity"
+            type="number"
+            :class="{ 'is-error': !row.materialQuantity && row.valid === false }"
+            style="margin-right: 30px"
+            :min="0"
+            placeholder="请输入数量"
+            @input="handleInput(row)"
+          ></el-input>
           <p v-else>{{ row.materialQuantity || '-' }}</p>
         </div>
         <p class="materialSubName" style="margin-top: 8px">规格型号：{{ row.materialModel }}</p>
@@ -66,14 +75,20 @@
         </el-radio-group>
         <div v-else>{{ row.materialIsSpecifiedBatch === '1' ? '是' : '否' }}</div>
         <div v-if="row.materialIsSpecifiedBatch === '1' && !approvalInputBatch">
-          <el-input v-if="!isView" v-model="row.materialBatch" style="margin-top: 16px" placeholder="请输入批次号"></el-input>
+          <el-input v-if="!isView" v-model="row.materialBatch" style="margin-top: 16px" :class="{ 'is-error': !row.materialBatch && row.valid === false }" placeholder="请输入批次号"></el-input>
+          <div v-else>{{ row.materialBatch || '-' }}</div>
+        </div>
+        <!-- 在审批时候要处理的输入框  -->
+        <div v-if="row.materialIsSpecifiedBatch === '1' && approvalInputBatch && fromApproval">
+          <el-input v-if="!row.materialBatch" v-model="row.materialBatch" style="margin-top: 16px" :class="{ 'is-error': !row.materialBatch && row.valid === false }" placeholder="请输入批次号"></el-input>
           <div v-else>{{ row.materialBatch || '-' }}</div>
         </div>
       </template>
       <template slot="warehouse" slot-scope="{ row }">
-        <el-select v-if="!isView" v-model="row.warehouse" placeholder="请选择" @change="(val) => handleChangeWarehouse(val, row)">
+        <el-select v-if="fromApproval && !row.warehouseNumber" v-model="row.warehouseNumber" placeholder="请选择" :class="{ 'is-error': !row.materialBatch && row.valid === false }" @change="(val) => handleChangeWarehouse(val, row)">
           <el-option v-for="item in warehouseList || []" :key="item.warehouseNumber" style="width: 100%" :label="item.warehouseName" :value="item.warehouseNumber"> </el-option>
         </el-select>
+        <div v-else>{{ row.warehouseName || '-' }}</div>
       </template>
       <template slot="remarks" slot-scope="{ row }">
         <el-input v-if="!isView" v-model="row.materialRemark" type="textarea" :rows="5" show-word-limit maxlength="100" placeholder="请输入"></el-input>
@@ -119,6 +134,11 @@ export default {
   inject: {
     formProps: {
       default: () => {}
+    },
+    getPropControl: {
+      default() {
+        return () => {}
+      }
     }
   },
   props: {
@@ -205,6 +225,15 @@ export default {
             'min-width': '160'
           }
         },
+        warehouse: {
+          prop: 'warehouse',
+          label: '库房',
+          type: 'slot',
+          slot: 'warehouse',
+          attrs: {
+            'min-width': '160'
+          }
+        },
         materialBatchInfo: {
           prop: 'materialBatchInfo',
           label: '是否指定批次',
@@ -256,6 +285,14 @@ export default {
       warehouseList: []
     }
   },
+  computed: {
+    /**
+     * 内嵌在审批流里的页面形式
+     */
+    fromApproval() {
+      return this.$route.query.from === 'approval'
+    }
+  },
   watch: {
     tableItemArr: {
       immediate: true,
@@ -552,4 +589,10 @@ export default {
   padding-left: 16px !important;
   padding-right: 16px !important;
 }
+.is-error {
+  /deep/ .el-input__inner {
+    color: #f4334a;
+    border-color: #f4334a;
+  }
+}
 </style>

package/dist/bizui/src/FieldMaterialSelect/index.vue

@@ -86,6 +86,10 @@ export default {
         this.$bizui.bus.$on('applySubmit', (val) => {
           this.handleValidate()
         })
+        // 审批时候提交的处理
+        this.$bizui.bus.$on('approvalSubmit', (val) => {
+          this.handleApprovalValidate()
+        })
         // 监听主体切换的回调
         this.$bizui.bus.$on('formBelongCompanyChange', (val) => {
           this.tableData = []
@@ -100,13 +104,24 @@ export default {
         })
       }
     },
+    handleApprovalValidate() {
+      this.tableData.forEach((item) => {
+        if (!item.warehouseNumber && this.tableItemArr.includes('warehouse')) {
+          this.$message.warning('请检查库房')
+          item.valid = false
+        } else if (item.materialIsSpecifiedBatch === '1' && this.attrs.approvalInputBatch && !item.materialBatch) {
+          this.$message.warning('请检查批次号')
+          item.valid = false
+        }
+      })
+    },
     handleValidate() {
       this.tableData.forEach((item) => {
         if (!item.materialQuantity) {
-          this.$message.error('请检查物料数量')
+          this.$message.warning('请检查物料数量')
           item.valid = false
         } else if (this.tableItemArr.includes('batch') && !this.attrs.approvalInputBatch && item.materialIsSpecifiedBatch === '1' && !item.materialBatch) {
-          this.$message.error('请检查批次号信息')
+          this.$message.warning('请检查批次号信息')
           item.valid = false
         } else {
           item.valid = true