2024-09-13

src/views/modules/customer/customerGroupInformation.vue

@@ -85,29 +85,31 @@
     </el-pagination>
 
     <el-dialog :title="modalData.title" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="客户组编码" prop="customerGroupId" :rules="rules.customerGroupId">
-          <el-input v-model="modalData.customerGroupId" :disabled="modalDisableFlag" style="width: 221px"></el-input>
-        </el-form-item>
-        <el-form-item label="客户组名称" prop="customerGroupName" :rules="rules.customerGroupName">
-          <el-input v-model="modalData.customerGroupName" style="width: 221px"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="是否在用" prop="active" :rules="rules.active">
-          <el-select v-model="modalData.active" style="width: 221px">
-            <el-option label="是" value="Y"></el-option>
-            <el-option label="否" value="N"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="客户组" prop="type" :rules="rules.type">
-          <el-select v-model="modalData.type" style="width: 221px">
-            <el-option label="客户组1" value="1"></el-option>
-            <el-option label="客户组2" value="2"></el-option>
-          </el-select>
-        </el-form-item>
+      <el-form  label-position="top" :model="modalData" :rules="rules">
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="客户组编码" prop="customerGroupId">
+              <el-input v-model="modalData.customerGroupId" :disabled="modalDisableFlag" ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="客户组名称" prop="customerGroupName">
+              <el-input v-model="modalData.customerGroupName" ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="客户组" prop="type">
+              <el-select v-model="modalData.type" style="width: 100%">
+                <el-option label="客户组1" value="1"></el-option>
+                <el-option label="客户组2" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8"><el-form-item label=" " >
+            <el-checkbox v-model="modalData.active" false-label="N" true-label="Y">是否在用</el-checkbox>
+          </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <el-footer style="height:30px;margin-top: 20px;text-align:center">
         <el-button type="primary" @click="saveData()">保存</el-button>

src/views/modules/quotation/sellForQuotation/quotationDetail/toolQuotation.vue

@@ -80,7 +80,7 @@ export default {
       },
       // 报价工具表单校验
       quotationToolRules: {
-        toolNo: [{required: true, validator:validateToolNo,message:" ", trigger: 'change'}],
+        toolNo: [{required: true, message:" ", trigger: 'change'}],
         toolDescription: [{required: true, message: ' ', trigger: ['change','blur']}],
         toolQuantity: [{required: true,pattern:/^[1-9]\d{0,14}(\.\d{1,16})?$|^0(\.\d{1,16})?$/, message: ' ', trigger: ['change','blur']}],
         unitCost: [{required: true,pattern:/^[1-9]\d{0,14}(\.\d{1,16})?$|^0(\.\d{1,16})?$/, message: ' ', trigger: ['change','blur']}],

src/views/modules/quotation/sellForQuotation/quoteDetail.vue

@@ -998,6 +998,9 @@ export default {
     tabClick(tab){
       if (this.activeName === 'cost'){
         this.searchQuoteBomList();
+        this.$refs.tool.initQuotationToolData();
+      }else if (this.activeName === 'tool'){
+        this.$refs.tool.initQuotationToolData();
       }
     },
     editQuotationDetailStatus(row,status){