tijiao

build/utils.js

@@ -20,7 +20,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "statisticalReport", "inward"];
 // let devModules = ["index", "WMS", "inward"];
 // let devModules = ["index", "inward", "WMS", "queue"];
-// let devModules = ["index", "appoint", "statisticalReport"];
+// let devModules = ["index", "appoint", "statisticalReport", "sale"];
 let devModules = ["all"];
 
 //let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS",'statisticalReport'];

src/components/DilCommonUI/packages/mergeRowTable/src/mergeRowTable.vue

@@ -9,6 +9,7 @@
       :border="border"
       :cell-class-name="cellClassName"
       :height="height"
+      :max-height="maxHeight"
       :highlight-current-row="highlightCurrentRow"
       style="width:100%"
       :span-method="objectSpanMethod"
@@ -185,7 +186,7 @@ export default {
     // Table 的最大高度。合法的值为数字或者单位为 px 的高度。
     //sdada
     maxHeight: {
-      default: null
+      default: "600px"
     },
     // 是否启用排序
     sortable: {

src/views/appoint/components/saleContract/addSaleOrderSteelSend.vue

@@ -169,7 +169,9 @@
 
     <div class="button_box">
       <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure" :loading="loading">确定</el-button>
+      <el-button type="primary" @click="makeSure" :loading="loading"
+        >确定</el-button
+      >
     </div>
   </div>
 </template>
@@ -188,7 +190,7 @@ export default {
       pos: 0,
       //加载
       selectLineLoading: false,
-      loading:false,
+      loading: false,
       //所有选中承运商Id和承运商名称暂存
       carrierIdAndName: [],
       //承运商下拉框中的值
@@ -523,8 +525,7 @@ export default {
     },
     //点击确定按钮的事件
     makeSure() {
-      this.loading=true;
-      return;
+      this.loading = true;
       if (this.canSend == -1) {
         this.$message.warning("电话号码格式不正确,请输入正确的电话号码!");
       } else {
@@ -575,7 +576,7 @@ export default {
                 } else {
                   this.$message.error("派单失败:" + res.data.data);
                 }
-                this.loading=false;
+                this.loading = false;
               });
           })
           .catch(() => {