1

src/views/OrderMannage/BusinessOrderlist/edit.vue

@@ -38,7 +38,7 @@
         :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,6 +52,70 @@
           />
           <span v-else>{{ info.order_no }}</span>
         </FormItem>
+         <!-- 负责人 -->
+         <FormItem
+          v-if="
+            formSetTableData.filter((v) => v.key == 'custom_detail_name')[0]
+              .is_show
+          "
+          :label="
+            formSetTableData.filter((v) => v.key == 'custom_detail_name')[0]
+              .title
+          "
+        >
+          <Select
+            placeholder="请选择负责人"
+            v-if="type != 3"
+            clearable
+            filterable
+            v-model="info.custom_detail_name"
+            @on-change="handleClientChargeChange"
+            class="auto-width"
+          >
+            <!-- @on-change="handleClientDetailChange" -->
+            <Option
+              v-for="item of clientDetailList_respon"
+              :key="item.service_name"
+              :label="item.service_name"
+              :value="item.service_name"
+            ></Option>
+          </Select>
+          <span v-else>{{ info.custom_detail_name }}</span>
+        </FormItem>
+           <!-- 详细地址 -->
+        <FormItem
+          v-if="
+            formSetTableData.filter((v) => v.key == 'custom_detail_id')[0]
+              .is_show
+          "
+          :label="
+            formSetTableData.filter((v) => v.key == 'custom_detail_id')[0].title
+          "
+        >
+          <Select
+            clearable
+            filterable
+            v-if="type != 3"
+            class="auto-width"
+            @on-change="handleClientDetailChange"
+            v-model="info.custom_detail_id"
+          >
+            <Option
+              v-for="item in clientDetailList_address"
+              :label="item.address"
+              :key="item.id"
+              :value="item.id"
+            ></Option>
+          </Select>
+          <span v-else>{{
+            clientDetailList.filter((v) => v.id == info.custom_detail_id)
+              .length > 0
+              ? clientDetailList.filter((v) => v.id == info.custom_detail_id)[0]
+                  .area_title
+              : ""
+          }}</span>
+        </FormItem>
+          <!-- 项目名称 -->
         <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'residential_name')[0]
@@ -70,6 +134,34 @@
           />
           <span v-else>{{ info.residential_name }}</span>
         </FormItem>
+            <!-- 包装 -->
+        <FormItem
+          prop="box_id"
+          v-if="formSetTableData.filter((v) => v.key == 'box_id')[0].is_show"
+          :label="formSetTableData.filter((v) => v.key == 'box_id')[0].title"
+        >
+          <Select
+            clearable
+            filterable
+            v-if="type != 3"
+            v-model="info.box_id"
+            class="auto-width"
+          >
+            <Option
+              v-for="item of sub_material_list"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            ></Option>
+          </Select>
+          <span v-else>{{
+            sub_material_list.length > 0 && info.box_id
+              ? sub_material_list.filter((item) => item.id == info.box_id)[0]
+                  .title
+              : ""
+          }}</span>
+        </FormItem>
+          <!-- 紧急程度 -->
         <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'warning_state')[0].is_show
@@ -99,40 +191,7 @@
               : ""
           }}</span>
         </FormItem>
-        <FormItem
-          v-if="
-            formSetTableData.filter((v) => v.key == 'front_money')[0].is_show
-          "
-          :label="
-            formSetTableData.filter((v) => v.key == 'front_money')[0].title
-          "
-        >
-          <Input
-            v-model="info.front_money"
-            class="auto-width"
-            v-if="type != 3"
-            placeholder="请输入项目定金"
-          />
-          <span v-else>{{ info.front_money }}</span>
-        </FormItem>
-        <FormItem
-          v-if="
-            formSetTableData.filter((v) => v.key == 'start_time')[0].is_show
-          "
-          :label="
-            formSetTableData.filter((v) => v.key == 'start_time')[0].title
-          "
-        >
-          <DatePicker
-            :options="options"
-            v-if="type != 3"
-            v-model="info.start_time"
-            type="date"
-            placeholder="开始日期"
-            class="auto-width"
-          ></DatePicker>
-          <span v-else>{{ info.start_time }}</span>
-        </FormItem>
+            <!-- 客户名称 -->
         <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'client_name')[0].is_show
@@ -162,36 +221,8 @@
               ? clientList.filter((item) => item.id == info.custom_id)[0].title
               : ""
           }}</span>
-        </FormItem>
-        <FormItem
-          v-if="
-            formSetTableData.filter((v) => v.key == 'custom_detail_name')[0]
-              .is_show
-          "
-          :label="
-            formSetTableData.filter((v) => v.key == 'custom_detail_name')[0]
-              .title
-          "
-        >
-          <Select
-            placeholder="请选择负责人"
-            v-if="type != 3"
-            clearable
-            filterable
-            v-model="info.custom_detail_name"
-            @on-change="handleClientChargeChange"
-            class="auto-width"
-          >
-            <!-- @on-change="handleClientDetailChange" -->
-            <Option
-              v-for="item of clientDetailList_respon"
-              :key="item.service_name"
-              :label="item.service_name"
-              :value="item.service_name"
-            ></Option>
-          </Select>
-          <span v-else>{{ info.custom_detail_name }}</span>
-        </FormItem>
+        </FormItem> 
+          <!-- 手机号 -->
         <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'custom_detail_mobile')[0]
@@ -218,38 +249,41 @@
           </Select>
           <span v-else>{{ info.custom_detail_mobile }}</span>
         </FormItem>
+ <!-- 开始日期 -->
         <FormItem
           v-if="
-            formSetTableData.filter((v) => v.key == 'custom_detail_id')[0]
-              .is_show
+            formSetTableData.filter((v) => v.key == 'start_time')[0].is_show
           "
           :label="
-            formSetTableData.filter((v) => v.key == 'custom_detail_id')[0].title
+            formSetTableData.filter((v) => v.key == 'start_time')[0].title
           "
         >
-          <Select
-            clearable
-            filterable
+          <DatePicker
+            :options="options"
             v-if="type != 3"
+            v-model="info.start_time"
+            type="date"
+            placeholder="开始日期"
             class="auto-width"
-            @on-change="handleClientDetailChange"
-            v-model="info.custom_detail_id"
-          >
-            <Option
-              v-for="item in clientDetailList_address"
-              :label="item.address"
-              :key="item.id"
-              :value="item.id"
-            ></Option>
-          </Select>
-          <span v-else>{{
-            clientDetailList.filter((v) => v.id == info.custom_detail_id)
-              .length > 0
-              ? clientDetailList.filter((v) => v.id == info.custom_detail_id)[0]
-                  .area_title
-              : ""
-          }}</span>
+          ></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"
+        >
+          <DatePicker
+            :options="options"
+            v-if="type != 3"
+            v-model="info.end_time"
+            type="date"
+            placeholder="交付日期"
+            class="auto-width"
+          ></DatePicker>
+          <span v-else>{{ info.end_time }}</span>
+        </FormItem>
+  <!-- 专营业务员 -->
         <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'service_id')[0].is_show
@@ -278,20 +312,7 @@
               : ""
           }}</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"
-        >
-          <DatePicker
-            :options="options"
-            v-if="type != 3"
-            v-model="info.end_time"
-            type="date"
-            placeholder="交付日期"
-            class="auto-width"
-          ></DatePicker>
-          <span v-else>{{ info.end_time }}</span>
-        </FormItem>
+  <!-- 产品总价 -->
         <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'predict_price')[0].is_show
@@ -309,6 +330,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"
@@ -322,6 +344,7 @@
           />
           <span v-else>{{ info.fax_price }}</span>
         </FormItem>
+     <!-- 订单金额 -->
         <FormItem
           v-if="
             formSetTableData.filter((v) => v.key == 'order_price')[0].is_show
@@ -339,32 +362,24 @@
           />
           <span v-else>{{ info.order_price }}</span>
         </FormItem>
+            <!-- 项目定金 -->
         <FormItem
-          prop="box_id"
-          v-if="formSetTableData.filter((v) => v.key == 'box_id')[0].is_show"
-          :label="formSetTableData.filter((v) => v.key == 'box_id')[0].title"
+          v-if="
+            formSetTableData.filter((v) => v.key == 'front_money')[0].is_show
+          "
+          :label="
+            formSetTableData.filter((v) => v.key == 'front_money')[0].title
+          "
         >
-          <Select
-            clearable
-            filterable
-            v-if="type != 3"
-            v-model="info.box_id"
+          <Input
+            v-model="info.front_money"
             class="auto-width"
-          >
-            <Option
-              v-for="item of sub_material_list"
-              :key="item.id"
-              :label="item.title"
-              :value="item.id"
-            ></Option>
-          </Select>
-          <span v-else>{{
-            sub_material_list.length > 0 && info.box_id
-              ? sub_material_list.filter((item) => item.id == info.box_id)[0]
-                  .title
-              : ""
-          }}</span>
+            v-if="type != 3"
+            placeholder="请输入项目定金"
+          />
+          <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"
@@ -378,6 +393,9 @@
           />
           <span v-else>{{ info.remark }}</span>
         </FormItem>
+
+      
+          <!-- 上传附件 -->
         <FormItem label="上传附件:">
           <div class="product-img">
             <div class="product-add">
@@ -2284,8 +2302,8 @@ export default {
         {
           is_show: true,
           key: "residential_name",
-          value: "项目名称",
-          title: "项目名称",
+          value: "项目地址",
+          title: "项目地址",
         },
         {
           is_show: true,
@@ -2326,8 +2344,8 @@ export default {
         {
           is_show: true,
           key: "custom_detail_id",
-          value: "详细地址",
-          title: "详细地址",
+          value: "地址",
+          title: "地址",
         },
         {
           is_show: true,

src/views/leadMatch/roomList/edit.vue

@@ -54,6 +54,7 @@
             <div class="table_header_left">
               <span>图号：{{item.url_number}}</span>
               <span>产品名称：{{item.product_title}}</span>
+              <span>批量数：{{item.number}}</span>
               <span :style="item.state == 1?'':'color:red;'">{{item.state == 0?'未匹配':item.state == 1?'匹配完成':'匹配中'}}</span>
             </div>
             <div class="table_header_right">
@@ -66,7 +67,7 @@
           <div>
             <Topsearch :list="list" @searchData="initData" />
           </div>
-              <Table :columns="set_tableColumns" border :data="tableData">
+              <Table :columns="set_tableColumns" border :data="tableData" max-height="450">
                   <template slot="match_state" slot-scope="{row}">
                       <span>{{row.state == 0?'未匹配':row.state == 2?'匹配完成':'匹配中'}}</span>
                   </template>

src/views/leadMatch/weightMemo/edit.vue

@@ -54,6 +54,7 @@
             <div class="table_header_left">
               <span>图号：{{item.url_number}}</span>
               <span>产品名称：{{item.product_title}}</span>
+                <span>批量数：{{item.number}}</span>
               <span :style="item.state == 1?'':'color:red;'"
                     v-if="$route.query.type != 3"
                     >{{item.state == 0?'未匹配':item.state == 1?'匹配完成':'匹配中'}}</span>
@@ -70,7 +71,7 @@
           </div>
           <div v-for="(_item,_index) in tableData" :key="_index">
               <div class="mate_info"><div>匹配信息：{{_item.value}} {{_item.number}}组</div><span>总计{{_item.children.length}}条数据</span></div>
-              <Table :columns="tableColumns" border :data="_item.children">
+              <Table :columns="tableColumns" border :data="_item.children" max-height="450">
                   <template slot="state" slot-scope="{row}">
                        <span>{{row.state ==0?'未匹配':row.state ==2?'匹配完成':'匹配中'}}</span>
                   </template>