1

src/views/BasicSettings/PartSettings/detail.vue

@@ -385,6 +385,9 @@ export default {
         .get("/api/properties_index", { params: { p_id, type_title } })
         .then((res) => {
           this.process_list = res.data.data;
+          if (this.formData.process_ids.length==this.process_list.length) {
+            this.formData.process_ids.unshift('全选')
+          }
         });
     },
     handlePartSelected(id, type) {
@@ -425,6 +428,9 @@ export default {
       if (this.type == 1) {
         this.formData.id = "";
       }
+      if (this.formData.process_ids.length == this.process_list.length + 1) {
+        this.formData.process_ids = this.formData.process_ids.splice(1);
+      }
       this.axios
         .post("/api/process_part_edit", {
           ...this.formData,

src/views/OrderMannage/BusinessOrderlist/edit.vue

@@ -38,7 +38,8 @@
         :model="info"
         style="padding: 10px 0"
         :rules="infoRules"
-      >   <!-- 订单编号 -->
+      >
+        <!-- 订单编号 -->
         <FormItem
           v-if="formSetTableData.filter((v) => v.key == 'order_no')[0].is_show"
           :label="formSetTableData.filter((v) => v.key == 'order_no')[0].title"
@@ -52,8 +53,8 @@
           />
           <span v-else>{{ info.order_no }}</span>
         </FormItem>
-         <!-- 负责人 -->
-         <FormItem
+        <!-- 负责人 -->
+        <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'custom_detail_name')[0]
               .is_show
@@ -82,7 +83,7 @@
           </Select>
           <span v-else>{{ info.custom_detail_name }}</span>
         </FormItem>
-           <!-- 详细地址 -->
+        <!-- 详细地址 -->
         <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'custom_detail_id')[0]
@@ -115,7 +116,7 @@
               : ""
           }}</span>
         </FormItem>
-          <!-- 项目名称 -->
+        <!-- 项目名称 -->
         <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'residential_name')[0]
@@ -134,7 +135,7 @@
           />
           <span v-else>{{ info.residential_name }}</span>
         </FormItem>
-            <!-- 包装 -->
+        <!-- 包装 -->
         <FormItem
           prop="box_id"
           v-if="formSetTableData.filter((v) => v.key == 'box_id')[0].is_show"
@@ -161,7 +162,7 @@
               : ""
           }}</span>
         </FormItem>
-          <!-- 紧急程度 -->
+        <!-- 紧急程度 -->
         <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'warning_state')[0].is_show
@@ -191,7 +192,7 @@
               : ""
           }}</span>
         </FormItem>
-            <!-- 客户名称 -->
+        <!-- 客户名称 -->
         <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'client_name')[0].is_show
@@ -221,8 +222,8 @@
               ? clientList.filter((item) => item.id == info.custom_id)[0].title
               : ""
           }}</span>
-        </FormItem> 
-          <!-- 手机号 -->
+        </FormItem>
+        <!-- 手机号 -->
         <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'custom_detail_mobile')[0]
@@ -249,7 +250,7 @@
           </Select>
           <span v-else>{{ info.custom_detail_mobile }}</span>
         </FormItem>
- <!-- 开始日期 -->
+        <!-- 开始日期 -->
         <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'start_time')[0].is_show
@@ -268,7 +269,7 @@
           ></DatePicker>
           <span v-else>{{ info.start_time }}</span>
         </FormItem>
-   <!-- 交付日期 -->
+        <!-- 交付日期 -->
         <FormItem
           v-if="formSetTableData.filter((v) => v.key == 'end_time')[0].is_show"
           :label="formSetTableData.filter((v) => v.key == 'end_time')[0].title"
@@ -283,7 +284,7 @@
           ></DatePicker>
           <span v-else>{{ info.end_time }}</span>
         </FormItem>
-  <!-- 专营业务员 -->
+        <!-- 专营业务员 -->
         <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'service_id')[0].is_show
@@ -312,7 +313,7 @@
               : ""
           }}</span>
         </FormItem>
-  <!-- 产品总价 -->
+        <!-- 产品总价 -->
         <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'predict_price')[0].is_show
@@ -330,7 +331,7 @@
           />
           <span v-else>{{ info.predict_price }}</span>
         </FormItem>
-  <!-- 折扣金额 -->
+        <!-- 折扣金额 -->
         <FormItem
           v-if="formSetTableData.filter((v) => v.key == 'fax_price')[0].is_show"
           :label="formSetTableData.filter((v) => v.key == 'fax_price')[0].title"
@@ -344,7 +345,7 @@
           />
           <span v-else>{{ info.fax_price }}</span>
         </FormItem>
-     <!-- 订单金额 -->
+        <!-- 订单金额 -->
         <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'order_price')[0].is_show
@@ -362,7 +363,7 @@
           />
           <span v-else>{{ info.order_price }}</span>
         </FormItem>
-            <!-- 项目定金 -->
+        <!-- 项目定金 -->
         <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'front_money')[0].is_show
@@ -379,7 +380,7 @@
           />
           <span v-else>{{ info.front_money }}</span>
         </FormItem>
-          <!-- 订单备注 -->
+        <!-- 订单备注 -->
         <FormItem
           v-if="formSetTableData.filter((v) => v.key == 'remark')[0].is_show"
           :label="formSetTableData.filter((v) => v.key == 'remark')[0].title"
@@ -394,8 +395,7 @@
           <span v-else>{{ info.remark }}</span>
         </FormItem>
 
-      
-          <!-- 上传附件 -->
+        <!-- 上传附件 -->
         <FormItem label="上传附件:">
           <div class="product-img">
             <div class="product-add">
@@ -506,7 +506,11 @@
             :edit-render="{}"
           >
             <template #edit="scope">
-              <Input v-if="!scope.row.is_metal" v-model="scope.row.position" />
+              <Input
+                @on-blur="HandleAutoCreateNewLine"
+                v-if="!scope.row.is_metal"
+                v-model="scope.row.position"
+              />
             </template>
             <template #default="scope">
               {{ scope.row.is_metal ? "" : scope.row.position }}
@@ -3634,6 +3638,17 @@ export default {
         },
       });
     },
+    HandleAutoCreateNewLine() {
+      let flag = false;
+      this.tableData.map((v) => {
+        if (!v.position || !v.product_id || !v.material_id) {
+          flag = true;
+        }
+      });
+      if (flag) {
+        this.handleTableAdd()
+      }
+    },
     handleTableAdd() {
       if (this.info.custom_id) {
         this.currentTabIndex = "0";
@@ -3762,10 +3777,10 @@ export default {
         case 4:
           obj = this.deepClone(row);
           obj.position = "";
-          obj.measure.map((v)=>{
-            v.value = ''
-            obj[v.e_title]=''
-          })
+          obj.measure.map((v) => {
+            v.value = "";
+            obj[v.e_title] = "";
+          });
           if (!row.is_metal) {
             this.route_id_at_copy = row.route_id;
           }

src/views/leadMatch/MatchList/matchPage.vue

@@ -125,8 +125,9 @@
                           @click="handleShowCurrencySheet(url_info)"
                           size="small"
                           type="text"
-                          >{{ url_info.isCurrenct ? "收缩" : "展开" }}</Button
                         >
+                          {{ url_info.isCurrenct ? "收缩" : "展开" }}
+                        </Button>
                         <Icon
                           size="20"
                           :type="

vue.config.js

@@ -1,6 +1,6 @@
 const axios_default_ip =
     process.env.NODE_ENV == 'dev' ?
-    'http://121.37.173.82:82' :
+    'http://121.41.102.225:82' :
     process.env.NODE_ENV == 'test-prd' ?
     'http://121.41.102.225:82' //测试服
     :