Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/productColumns.js

@@ -21,7 +21,7 @@ export default {
           },
           render: (h, { row, column, index }) => {
             return this.isEditIndex == index ? <div class="redbordererr">
-              <el-form-item label="" label-width="0px" prop={`orderProducts.${index}.${column.columnAttributes.prop}`} rules={this.orderInfo.isCj ? [] : required}>
+              <el-form-item label="" label-width="0px" prop={`orderProducts.${index}.${column.columnAttributes.prop}`} rules={this.orderInfo.isCj ? [] : []}>
                 <el-select
                   disabled={!this.formOptions.orderProducts.isEdit}
                   value={row[column.columnAttributes.prop]}
@@ -77,7 +77,7 @@ export default {
           },
           render: (h, { row, column, index }) => {
             return this.isEditIndex == index ? <div class="redbordererr">
-              <el-form-item label="" label-width="0px" prop={`orderProducts.${index}.${column.columnAttributes.prop}`} rules={this.orderInfo.isCj ? [] : required}>
+              <el-form-item label="" label-width="0px" prop={`orderProducts.${index}.${column.columnAttributes.prop}`} rules={this.orderInfo.isCj ? [] : []}>
                 <el-select
                   disabled={!this.formOptions.orderProducts.isEdit}
                   value={row[column.columnAttributes.prop]}
@@ -304,9 +304,9 @@ export default {
         ...(() => {
           if (index > -1) {
             return [
-              `orderProducts.${index}.brandId`,
+              // `orderProducts.${index}.brandId`,
               `orderProducts.${index}.mainId`,
-              `orderProducts.${index}.smallId`,
+              // `orderProducts.${index}.smallId`,
               `orderProducts.${index}.productName`,
               `orderProducts.${index}.num`,
               `orderProducts.${index}.remark`,