diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 4cae18a..25f5978 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -182,15 +182,16 @@
         temp.deliveryArea = this.AreaList[aindex].areaName;
         turnOrder(temp).then((res) => {
           this.$message.success("添加成功");
-          this.close();
+          this.$emit("close");
+          this.reset();
         });
-      }else {
-        console.log(this.valiatePhone())
-        if(this.valiatePhone() === false){
+      } else {
+        console.log(this.valiatePhone());
+        if (this.valiatePhone() === false) {
           this.$message.error("请检查手机号格式是否正确");
-        }else if(this.valiateProvince() === false){
+        } else if (this.valiateProvince() === false) {
           this.$message.error("请检查地址格式是否正确");
-        }else{
+        } else {
           this.$message.error("请正确填写信息");
         }
       }

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 4cae18a..25f5978 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -182,15 +182,16 @@
         temp.deliveryArea = this.AreaList[aindex].areaName;
         turnOrder(temp).then((res) => {
           this.$message.success("添加成功");
-          this.close();
+          this.$emit("close");
+          this.reset();
         });
-      }else {
-        console.log(this.valiatePhone())
-        if(this.valiatePhone() === false){
+      } else {
+        console.log(this.valiatePhone());
+        if (this.valiatePhone() === false) {
           this.$message.error("请检查手机号格式是否正确");
-        }else if(this.valiateProvince() === false){
+        } else if (this.valiateProvince() === false) {
           this.$message.error("请检查地址格式是否正确");
-        }else{
+        } else {
           this.$message.error("请正确填写信息");
         }
       }
diff --git a/src/components/mycomponent/groupPage.vue b/src/components/mycomponent/groupPage.vue
index 666edc1..372e253 100644
--- a/src/components/mycomponent/groupPage.vue
+++ b/src/components/mycomponent/groupPage.vue
@@ -1,7 +1,7 @@
 <!--分页组件-->
 <template>
   <div class="footer">
-    <div>共{{ total }}页记录 第{{ offset }}/{{ total }}页</div>
+    <div>共{{ count }}条记录 第{{ offset }}/{{ total }}页</div>
     <div>
       <el-pagination
         ref="compontentPage"

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 4cae18a..25f5978 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -182,15 +182,16 @@
         temp.deliveryArea = this.AreaList[aindex].areaName;
         turnOrder(temp).then((res) => {
           this.$message.success("添加成功");
-          this.close();
+          this.$emit("close");
+          this.reset();
         });
-      }else {
-        console.log(this.valiatePhone())
-        if(this.valiatePhone() === false){
+      } else {
+        console.log(this.valiatePhone());
+        if (this.valiatePhone() === false) {
           this.$message.error("请检查手机号格式是否正确");
-        }else if(this.valiateProvince() === false){
+        } else if (this.valiateProvince() === false) {
           this.$message.error("请检查地址格式是否正确");
-        }else{
+        } else {
           this.$message.error("请正确填写信息");
         }
       }
diff --git a/src/components/mycomponent/groupPage.vue b/src/components/mycomponent/groupPage.vue
index 666edc1..372e253 100644
--- a/src/components/mycomponent/groupPage.vue
+++ b/src/components/mycomponent/groupPage.vue
@@ -1,7 +1,7 @@
 <!--分页组件-->
 <template>
   <div class="footer">
-    <div>共{{ total }}页记录 第{{ offset }}/{{ total }}页</div>
+    <div>共{{ count }}条记录 第{{ offset }}/{{ total }}页</div>
     <div>
       <el-pagination
         ref="compontentPage"
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index 4398baa..241cdd4 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -5,22 +5,48 @@
       <div class="productInput">
         项目名称
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemName" placeholder="请输入项目名称" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemName"
+            placeholder="请输入项目名称"
+            clearable
+            class="product-input"
+          />
         </div>
         项目预算
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemBudget" placeholder="请输入项目预算" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemBudget"
+            placeholder="请输入项目预算"
+            clearable
+            class="product-input"
+          />
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
+          <el-date-picker
+            v-model="selectInfo.itemDuration"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择日期"
+            class="product-input"
+          />
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
       </div>
@@ -39,14 +65,31 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
       <el-table-column prop="itemBudget" label="项目预算" />
-      <el-table-column prop="itemDuration" label="预计工期" />
+      <el-table-column prop="itemDuration" label="预计工期" >
+        <template slot-scope="{row}">
+          <span>
+           {{row.itemDuration.split(' ')[0]}}
+          </span>
+        </template>
+    </el-table-column>
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
+      <el-table-column label="项目地址">
+        <template slot-scope="{row}">
+          <span>
+            {{row.itemProvince === row.itemCity ? row.itemCity + row.itemArea  + row.itemAddress : row.itemProvince + row.itemCity + row.itemArea  + row.itemAddress}}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="handlerDetail(scope.row)">
@@ -66,64 +109,96 @@
     />
     <!-- xiangqing弹框 -->
 
-    <businessDetailDialog v-if="dialogFormVisible" :data-info="dataInfo" @close="detailClose" />
+    <businessDetailDialog
+      v-if="dialogFormVisible"
+      :data-info="dataInfo"
+      @close="detailClose"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import businessDetailDialog from '../../components/mycomponent/dialog/business/businessDetailDialog.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import businessDetailDialog from "../../components/mycomponent/dialog/business/businessDetailDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/business/business'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import { listPage } from "../../api/business/business";
+export default {
+  // 加入分页逻辑
   components: {
     GroupPage,
-    businessDetailDialog
+    businessDetailDialog,
   },
   mixins: [listMixin],
   data() {
     return {
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
       dialogFormVisible: false,
-      dataInfo: {}
-    }
+      dataInfo: {},
+    };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     tableRowClassName: tableRowClassName,
     detailClose() {
-      this.dialogFormVisible = false
+      this.dialogFormVisible = false;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     handlerDetail(row) {
-      console.log(row)
-      this.dialogFormVisible = true
-      this.dataInfo = row
-    }
-  }
-
-}
+      console.log(row);
+      this.dialogFormVisible = true;
+      this.dataInfo = row;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -184,11 +259,9 @@
     color: #6666;
     margin: 30px 10px;
   }
-
 }
 
 .order-dialog {
-
   .dialog-tab {
     .dialog-title {
       font-size: 16px;

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 4cae18a..25f5978 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -182,15 +182,16 @@
         temp.deliveryArea = this.AreaList[aindex].areaName;
         turnOrder(temp).then((res) => {
           this.$message.success("添加成功");
-          this.close();
+          this.$emit("close");
+          this.reset();
         });
-      }else {
-        console.log(this.valiatePhone())
-        if(this.valiatePhone() === false){
+      } else {
+        console.log(this.valiatePhone());
+        if (this.valiatePhone() === false) {
           this.$message.error("请检查手机号格式是否正确");
-        }else if(this.valiateProvince() === false){
+        } else if (this.valiateProvince() === false) {
           this.$message.error("请检查地址格式是否正确");
-        }else{
+        } else {
           this.$message.error("请正确填写信息");
         }
       }
diff --git a/src/components/mycomponent/groupPage.vue b/src/components/mycomponent/groupPage.vue
index 666edc1..372e253 100644
--- a/src/components/mycomponent/groupPage.vue
+++ b/src/components/mycomponent/groupPage.vue
@@ -1,7 +1,7 @@
 <!--分页组件-->
 <template>
   <div class="footer">
-    <div>共{{ total }}页记录 第{{ offset }}/{{ total }}页</div>
+    <div>共{{ count }}条记录 第{{ offset }}/{{ total }}页</div>
     <div>
       <el-pagination
         ref="compontentPage"
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index 4398baa..241cdd4 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -5,22 +5,48 @@
       <div class="productInput">
         项目名称
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemName" placeholder="请输入项目名称" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemName"
+            placeholder="请输入项目名称"
+            clearable
+            class="product-input"
+          />
         </div>
         项目预算
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemBudget" placeholder="请输入项目预算" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemBudget"
+            placeholder="请输入项目预算"
+            clearable
+            class="product-input"
+          />
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
+          <el-date-picker
+            v-model="selectInfo.itemDuration"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择日期"
+            class="product-input"
+          />
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
       </div>
@@ -39,14 +65,31 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
       <el-table-column prop="itemBudget" label="项目预算" />
-      <el-table-column prop="itemDuration" label="预计工期" />
+      <el-table-column prop="itemDuration" label="预计工期" >
+        <template slot-scope="{row}">
+          <span>
+           {{row.itemDuration.split(' ')[0]}}
+          </span>
+        </template>
+    </el-table-column>
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
+      <el-table-column label="项目地址">
+        <template slot-scope="{row}">
+          <span>
+            {{row.itemProvince === row.itemCity ? row.itemCity + row.itemArea  + row.itemAddress : row.itemProvince + row.itemCity + row.itemArea  + row.itemAddress}}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="handlerDetail(scope.row)">
@@ -66,64 +109,96 @@
     />
     <!-- xiangqing弹框 -->
 
-    <businessDetailDialog v-if="dialogFormVisible" :data-info="dataInfo" @close="detailClose" />
+    <businessDetailDialog
+      v-if="dialogFormVisible"
+      :data-info="dataInfo"
+      @close="detailClose"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import businessDetailDialog from '../../components/mycomponent/dialog/business/businessDetailDialog.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import businessDetailDialog from "../../components/mycomponent/dialog/business/businessDetailDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/business/business'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import { listPage } from "../../api/business/business";
+export default {
+  // 加入分页逻辑
   components: {
     GroupPage,
-    businessDetailDialog
+    businessDetailDialog,
   },
   mixins: [listMixin],
   data() {
     return {
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
       dialogFormVisible: false,
-      dataInfo: {}
-    }
+      dataInfo: {},
+    };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     tableRowClassName: tableRowClassName,
     detailClose() {
-      this.dialogFormVisible = false
+      this.dialogFormVisible = false;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     handlerDetail(row) {
-      console.log(row)
-      this.dialogFormVisible = true
-      this.dataInfo = row
-    }
-  }
-
-}
+      console.log(row);
+      this.dialogFormVisible = true;
+      this.dataInfo = row;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -184,11 +259,9 @@
     color: #6666;
     margin: 30px 10px;
   }
-
 }
 
 .order-dialog {
-
   .dialog-tab {
     .dialog-title {
       font-size: 16px;
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 7045eaf..e1c37c7 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -1,21 +1,29 @@
 <!--商机报备表单-->
 <template>
   <div class="report-container">
-    <div class="report-title">
-      基础报备
-    </div>
+    <div class="report-title">基础报备</div>
     <div class="report-from">
-      <div class="from-title">
-        基础信息
-      </div>
+      <div class="from-title">基础信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemName" title="项目名称" placeholder="请输入项目名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemName"
+            title="项目名称"
+            placeholder="请输入项目名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemBudget" title="项目预算" placeholder="请输入项目预算" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemBudget"
+            title="项目预算"
+            placeholder="请输入项目预算"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -25,7 +33,7 @@
               value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
-              style="width:380px"
+              style="width: 380px"
             />
           </inputVue>
         </div>
@@ -43,7 +51,13 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.phone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.phone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -60,8 +74,18 @@
         <div class="input-item">
           <RedStar />
           <inputVue title="商机状态" class="inputWidth">
-            <el-select v-model="addInfo.status" clearable placeholder="请选择" style="width:380px">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select
+              v-model="addInfo.status"
+              clearable
+              placeholder="请选择"
+              style="width: 380px"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </inputVue>
         </div>
@@ -72,10 +96,15 @@
               v-model="addInfo.itemProvince"
               clearable
               placeholder="省/市"
-              style="width:150px;margin-left: 55px;"
+              style="width: 150px; margin-left: 55px"
               @change="provinceChange"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -83,29 +112,53 @@
               v-model="addInfo.itemCity"
               clearable
               placeholder="市/区"
-              style="width:150px"
+              style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.itemArea" clearable placeholder="县/街道" style="width:150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+            <el-select
+              v-model="addInfo.itemArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.itemAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.itemAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        关联方信息
-      </div>
+      <div class="from-title">关联方信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.ownerName" title="业主方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.ownerName"
+            title="业主方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -131,7 +184,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.contractName" title="总包方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.contractName"
+            title="总包方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -189,7 +248,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.agentName" title="代理商名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.agentName"
+            title="代理商名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -214,19 +279,29 @@
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        产品信息
-      </div>
+      <div class="from-title">产品信息</div>
       <div class="from-table">
-        <div style="margin-left: 2px;">
-          <el-table ref="tb" :data="addInfo.productList" border class="el-tab" style="width: 100%;">
+        <div style="margin-left: 2px">
+          <el-table
+            ref="tb"
+            :data="addInfo.productList"
+            border
+            class="el-tab"
+            style="width: 100%"
+          >
             <el-table-column type="index" label="序号" width="50px" />
+            
             <el-table-column prop="brandName" label="产品品牌" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.brandName }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.brandName" placeholder="请输入产品品牌">
                 </el-input> -->
-                <el-select v-if="showEdit[$index]" v-model="brandName" clearable placeholder="请输入产品品牌">
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="brandName"
+                  clearable
+                  placeholder="请输入产品品牌"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.brandCode"
@@ -237,7 +312,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="categoryIds" label="产品品类" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.categoryIds }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.categoryIds" placeholder="请输入产品品类">
                 </el-input> -->
@@ -257,8 +332,26 @@
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column prop="productName" label="产品名称" width="200px">
+              <template slot-scope="{ row, $index }">
+                <span v-if="!showEdit[$index]">{{ row.productName }}</span>
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productName"
+                  clearable
+                  placeholder="请输入产品型号"
+                >
+                  <el-option
+                    v-for="item in CodeList"
+                    :key="item.id + 1"
+                    :label="item.productName"
+                    :value="item.productName"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="productCode" label="产品型号" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productCode }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productCode" placeholder="请输入产品型号">
                 </el-input> -->
@@ -277,38 +370,63 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="productQuantity" label="产品数量" width="200px">
-              <template slot-scope="{row,$index}">
+            <el-table-column
+              prop="productQuantity"
+              label="产品数量"
+              width="200px"
+            >
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productQuantity }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productQuantity" placeholder="请输入产品数量" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productQuantity"
+                  placeholder="请输入产品数量"
+                />
               </template>
             </el-table-column>
             <el-table-column prop="productPrice" label="产品单价" width="200px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productPrice }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productPrice" placeholder="请输入产品单价" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productPrice"
+                  placeholder="请输入产品单价"
+                />
               </template>
             </el-table-column>
-            <el-table-column header-align="center" align="center" width="200" label="操作">
-              <template slot-scope="{row,$index}">
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showUpdate($index, row)">
+            <el-table-column
+              header-align="center"
+              align="center"
+              width="200"
+              label="操作"
+            >
+              <template slot-scope="{ row, $index }">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showUpdate($index, row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showDelete($index, row)">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showDelete($index, row)"
+                >
                   删除
                 </el-button>
                 <el-button
                   v-if="showEdit[$index]"
                   size="small"
-                  style="color: #85ce61;"
+                  style="color: #85ce61"
                   @click="submit($index, row)"
                 >
                   确定
                 </el-button>
                 <el-button
-                  v-if="showEdit[$index] && isFirst[$index] >1"
+                  v-if="showEdit[$index] && isFirst[$index] > 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="cancelUpdate($index)"
                 >
                   取消
@@ -316,7 +434,7 @@
                 <el-button
                   v-if="showEdit[$index] && isFirst[$index] === 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="showDelete($index)"
                 >
                   删除
@@ -327,300 +445,323 @@
         </div>
       </div>
       <div>
-          <el-button class="table-btn" @click="handleAddBtn">
-            添加项目需求
-          </el-button>
-        </div>
+        <el-button class="table-btn" @click="handleAddBtn">
+          添加项目需求
+        </el-button>
+      </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+      <el-button type="info" class="close" @click="close"> 取消 </el-button>
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { list } from '../../api/product/product'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { add } from '../../api/business/business'
-import { order_area } from '../../api/order/order'
-import { Message } from 'element-ui'
+import { list } from "../../api/product/product";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { add } from "../../api/business/business";
+import { order_area } from "../../api/order/order";
+import { Message } from "element-ui";
 export default {
   components: {
-    RedStar, inputVue
+    RedStar,
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
+      brandName: "",
+      categoryIds: "",
       CodeList: [],
       brandList: [],
       categoryList: [],
       checkedDetail: [],
       showEdit: [], // 用来判断是否处于编辑状态
-      isFirst:[], // 用来判断是否初次添加
+      isFirst: [], // 用来判断是否初次添加
       options: [
-        { value: '0', label: '推进' },
-        { value: '1', label: '成交' },
-        { value: '2', label: '丢失' }
+        { value: "0", label: "推进" },
+        { value: "1", label: "成交" },
+        { value: "2", label: "丢失" },
       ],
       addInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
-      }
-    }
+        countyList: [],
+      },
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
+        console.log(newval, oldval);
         if (!this.addInfo.itemProvince) {
-          this.addInfo.itemCity = ''
-          this.addInfo.itemArea = ''
+          this.addInfo.itemCity = "";
+          this.addInfo.itemArea = "";
         } else if (!this.addInfo.itemCity) {
-          this.addInfo.itemArea = ''
+          this.addInfo.itemArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
   },
-  mounted() {
-
-  },
+  mounted() {},
   methods: {
     save() {
-      if(this.valiateForm()){
-        this.addInfo.productList = {
-        productCode: this.addInfo.productList.productCode,
-        productQuantity: this.addInfo.productList.productQuantity,
-        productPrice: this.addInfo.productList.productPrice,
-        productName: ''
-      }
-      add(this.addInfo).then(res => {
-        this.setData()
+      if (this.valiateForm()) {
+        //   this.addInfo.productList = {
+        //   productCode: this.addInfo.productList.productCode,
+        //   productQuantity: this.addInfo.productList.productQuantity,
+        //   productPrice: this.addInfo.productList.productPrice,
+        //   productName: ''
+        // }
+        if(this.addInfo.productList.length && this.showEdit.every(item => item=== false)){
+          add(this.addInfo).then((res) => {
+          this.setData();
           this.$message({
-            message: '保存成功',
-            type: 'success'
-          })
-      }) 
+            message: "保存成功",
+            type: "success",
+          });
+        });
+        }else{
+          this.$message.error('请先添加或保存产品信息')
+        }
       } else {
         this.$message({
-            message: '请先完整填写报备信息',
-            type: 'error'
-          })
+          message: "请先完整填写报备信息",
+          type: "error",
+        });
       }
-      
     },
     close() {
-      this.setData()
+      this.setData();
     },
     provinceChange(e) {
-      console.log(e)
-      const index = this.form.provinceList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.provinceList[index].id
+      console.log(e);
+      const index = this.form.provinceList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.provinceList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(e) {
-      const index = this.form.cityList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.cityList[index].id
+      const index = this.form.cityList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.cityList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     handleAddBtn() {
-      const obj = {}
-      obj.brandName = ''
-      obj.categoryIds = ''
-      obj.productCode = ''
-      obj.productQuantity = ''
-      obj.productPrice = ''
-      this.addInfo.productList.push(obj)
-      this.showEdit[this.addInfo.productList.length-1] = true
-      this.isFirst[this.addInfo.productList.length - 1] = 1
-      C_list().then(res => {
-        console.log(res, '品类')
-        this.categoryList = res.data
-      })
-      SelectList().then(res => {
-        console.log(res, '品牌')
-        this.brandList = res
-      })
+      if (
+        this.showEdit[this.addInfo.productList.length - 1] === false ||
+        this.addInfo.productList.length === 0
+      ) {
+        const obj = {};
+        obj.brandName = "";
+        obj.categoryIds = "";
+        obj.productCode = "";
+        obj.productQuantity = "";
+        obj.productPrice = "";
+        obj.productName = "";
+        this.addInfo.productList.push(obj);
+        this.showEdit[this.addInfo.productList.length - 1] = true;
+        this.isFirst[this.addInfo.productList.length - 1] = 1;
+        C_list().then((res) => {
+          this.categoryList = res.data;
+        });
+        SelectList().then((res) => {
+          this.brandList = res;
+        });
+      } else {
+        this.$message.warning("请先保存上一次");
+      }
     },
     showUpdate(index, row) {
-      this.showEdit[index] = true
-      this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
-      this.brandName = row.brandName
-      this.categoryIds = row.categoryIds
-      this.addInfo.productList.productCode = row.productCode
-      this.addInfo.productList.productQuantity = row.productQuantity
-      this.addInfo.productList.productPrice = row.productPrice
+      this.showEdit[index] = true;
+      this.$set(this.showEdit, index, true); // 这里要用$set方法，否则页面状态不更新
+      this.brandName = row.brandName;
+      this.categoryIds = row.categoryIds;
+      this.addInfo.productList.productCode = row.productCode;
+      this.addInfo.productList.productQuantity = row.productQuantity;
+      this.addInfo.productList.productPrice = row.productPrice;
+      this.addInfo.productList.productName = row.productName;
     },
-    showDelete(index, row){
-      this.$confirm('确认删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    showDelete(index, row) {
+      this.$confirm("确认删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.addInfo.productList = this.addInfo.productList.filter((item,Index) => index!==Index)
-          this.showEdit = this.showEdit.filter((item,Index) => index!==Index)
-          this.isFirst = this.isFirst.filter((item,Index) => index!==Index)
+          this.addInfo.productList = this.addInfo.productList.filter(
+            (item, Index) => index !== Index
+          );
+          this.showEdit = this.showEdit.filter(
+            (item, Index) => index !== Index
+          );
+          this.isFirst = this.isFirst.filter((item, Index) => index !== Index);
           this.$message({
-            message: '已删除',
-            type: 'success'
-          })
+            message: "已删除",
+            type: "success",
+          });
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
+      const index = this.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      const code = this.categoryList[index].id;
+      console.log(code);
+      list({ categoryId: code }).then((res) => {
+        console.log(res);
+        this.CodeList = res;
+        // this.addInfo.productList.productName =''
+        // this.addInfo.productList.productCode =''
+      });
     },
     cancelUpdate(index) {
-      this.$confirm('取消修改？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("取消修改？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.$set(this.showEdit, index, false)
+          this.$set(this.showEdit, index, false);
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     submit(index, row) {
       // 发送请求，隐藏输入框
-      const { productCode, brandName, categoryIds, addInfo: { productList: { productQuantity, productPrice } } } = this
-      if (categoryIds&& brandName  && productQuantity && productPrice) {
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
+      const {
+        brandName,
+        categoryIds,
+        addInfo: {
+          productList: { productQuantity, productPrice },
+        },
+      } = this;
+      if (categoryIds && brandName) {
+        if (productQuantity > 0 && productPrice > 0) {
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$message({
+            type: "success",
+            message: "已缓存，记得点击保存提交修改喔！",
+            duration: 888,
+            onClose: () => {
+              this.$set(this.showEdit, index, false); // vue添加属性的方法
+            },
+          });
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$set(this.isFirst, index, 2);
+          this.brandName = "";
+          this.categoryIds = "";
+          this.addInfo.productList.productCode = "";
+          this.addInfo.productList.productQuantity = "";
+          this.addInfo.productList.productPrice = "";
+          this.addInfo.productList.productName = "";
+        } else {
+          this.$message.error("单价或数量需大于等于1");
+        }
+      } else {
         this.$message({
-          type: 'success',
-          message: '已缓存，记得点击保存提交修改喔！',
-          duration: 888,
-          onClose: () => {
-            this.$set(this.showEdit, index, false) // vue添加属性的方法
-          }
-        })
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
-        this.$set(this.isFirst, index, 2)
-        this.brandName = ''
-        this.categoryIds = ''
-        this.addInfo.productList.productCode = ''
-        this.addInfo.productList.productQuantity = ''
-        this.addInfo.productList.productPrice = ''
-      } else{
-        this.$message({
-              message: "请先完整选择或填写信息",
-              type: "error",
-            });
+          message: "请先完整选择或填写信息",
+          type: "error",
+        });
       }
     },
     setData() {
       this.addInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
+      };
     },
     valiateForm() {
-      let arr = []
-      for(var item in this.addInfo) {
-        if(this.addInfo[item]){
-          arr.push(1)
-        }else{
-          arr.push(0)
+      let arr = [];
+      for (var item in this.addInfo) {
+        if (this.addInfo[item]) {
+          arr.push(1);
+        } else {
+          arr.push(0);
         }
       }
-      return arr.every(item => item === 1)
-    }
-  }
-}
+      return arr.every((item) => item === 1);
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -673,7 +814,6 @@
     .close {
       width: 100px;
     }
-
   }
 }
 </style>

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 4cae18a..25f5978 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -182,15 +182,16 @@
         temp.deliveryArea = this.AreaList[aindex].areaName;
         turnOrder(temp).then((res) => {
           this.$message.success("添加成功");
-          this.close();
+          this.$emit("close");
+          this.reset();
         });
-      }else {
-        console.log(this.valiatePhone())
-        if(this.valiatePhone() === false){
+      } else {
+        console.log(this.valiatePhone());
+        if (this.valiatePhone() === false) {
           this.$message.error("请检查手机号格式是否正确");
-        }else if(this.valiateProvince() === false){
+        } else if (this.valiateProvince() === false) {
           this.$message.error("请检查地址格式是否正确");
-        }else{
+        } else {
           this.$message.error("请正确填写信息");
         }
       }
diff --git a/src/components/mycomponent/groupPage.vue b/src/components/mycomponent/groupPage.vue
index 666edc1..372e253 100644
--- a/src/components/mycomponent/groupPage.vue
+++ b/src/components/mycomponent/groupPage.vue
@@ -1,7 +1,7 @@
 <!--分页组件-->
 <template>
   <div class="footer">
-    <div>共{{ total }}页记录 第{{ offset }}/{{ total }}页</div>
+    <div>共{{ count }}条记录 第{{ offset }}/{{ total }}页</div>
     <div>
       <el-pagination
         ref="compontentPage"
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index 4398baa..241cdd4 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -5,22 +5,48 @@
       <div class="productInput">
         项目名称
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemName" placeholder="请输入项目名称" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemName"
+            placeholder="请输入项目名称"
+            clearable
+            class="product-input"
+          />
         </div>
         项目预算
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemBudget" placeholder="请输入项目预算" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemBudget"
+            placeholder="请输入项目预算"
+            clearable
+            class="product-input"
+          />
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
+          <el-date-picker
+            v-model="selectInfo.itemDuration"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择日期"
+            class="product-input"
+          />
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
       </div>
@@ -39,14 +65,31 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
       <el-table-column prop="itemBudget" label="项目预算" />
-      <el-table-column prop="itemDuration" label="预计工期" />
+      <el-table-column prop="itemDuration" label="预计工期" >
+        <template slot-scope="{row}">
+          <span>
+           {{row.itemDuration.split(' ')[0]}}
+          </span>
+        </template>
+    </el-table-column>
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
+      <el-table-column label="项目地址">
+        <template slot-scope="{row}">
+          <span>
+            {{row.itemProvince === row.itemCity ? row.itemCity + row.itemArea  + row.itemAddress : row.itemProvince + row.itemCity + row.itemArea  + row.itemAddress}}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="handlerDetail(scope.row)">
@@ -66,64 +109,96 @@
     />
     <!-- xiangqing弹框 -->
 
-    <businessDetailDialog v-if="dialogFormVisible" :data-info="dataInfo" @close="detailClose" />
+    <businessDetailDialog
+      v-if="dialogFormVisible"
+      :data-info="dataInfo"
+      @close="detailClose"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import businessDetailDialog from '../../components/mycomponent/dialog/business/businessDetailDialog.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import businessDetailDialog from "../../components/mycomponent/dialog/business/businessDetailDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/business/business'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import { listPage } from "../../api/business/business";
+export default {
+  // 加入分页逻辑
   components: {
     GroupPage,
-    businessDetailDialog
+    businessDetailDialog,
   },
   mixins: [listMixin],
   data() {
     return {
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
       dialogFormVisible: false,
-      dataInfo: {}
-    }
+      dataInfo: {},
+    };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     tableRowClassName: tableRowClassName,
     detailClose() {
-      this.dialogFormVisible = false
+      this.dialogFormVisible = false;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     handlerDetail(row) {
-      console.log(row)
-      this.dialogFormVisible = true
-      this.dataInfo = row
-    }
-  }
-
-}
+      console.log(row);
+      this.dialogFormVisible = true;
+      this.dataInfo = row;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -184,11 +259,9 @@
     color: #6666;
     margin: 30px 10px;
   }
-
 }
 
 .order-dialog {
-
   .dialog-tab {
     .dialog-title {
       font-size: 16px;
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 7045eaf..e1c37c7 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -1,21 +1,29 @@
 <!--商机报备表单-->
 <template>
   <div class="report-container">
-    <div class="report-title">
-      基础报备
-    </div>
+    <div class="report-title">基础报备</div>
     <div class="report-from">
-      <div class="from-title">
-        基础信息
-      </div>
+      <div class="from-title">基础信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemName" title="项目名称" placeholder="请输入项目名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemName"
+            title="项目名称"
+            placeholder="请输入项目名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemBudget" title="项目预算" placeholder="请输入项目预算" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemBudget"
+            title="项目预算"
+            placeholder="请输入项目预算"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -25,7 +33,7 @@
               value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
-              style="width:380px"
+              style="width: 380px"
             />
           </inputVue>
         </div>
@@ -43,7 +51,13 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.phone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.phone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -60,8 +74,18 @@
         <div class="input-item">
           <RedStar />
           <inputVue title="商机状态" class="inputWidth">
-            <el-select v-model="addInfo.status" clearable placeholder="请选择" style="width:380px">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select
+              v-model="addInfo.status"
+              clearable
+              placeholder="请选择"
+              style="width: 380px"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </inputVue>
         </div>
@@ -72,10 +96,15 @@
               v-model="addInfo.itemProvince"
               clearable
               placeholder="省/市"
-              style="width:150px;margin-left: 55px;"
+              style="width: 150px; margin-left: 55px"
               @change="provinceChange"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -83,29 +112,53 @@
               v-model="addInfo.itemCity"
               clearable
               placeholder="市/区"
-              style="width:150px"
+              style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.itemArea" clearable placeholder="县/街道" style="width:150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+            <el-select
+              v-model="addInfo.itemArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.itemAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.itemAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        关联方信息
-      </div>
+      <div class="from-title">关联方信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.ownerName" title="业主方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.ownerName"
+            title="业主方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -131,7 +184,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.contractName" title="总包方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.contractName"
+            title="总包方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -189,7 +248,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.agentName" title="代理商名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.agentName"
+            title="代理商名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -214,19 +279,29 @@
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        产品信息
-      </div>
+      <div class="from-title">产品信息</div>
       <div class="from-table">
-        <div style="margin-left: 2px;">
-          <el-table ref="tb" :data="addInfo.productList" border class="el-tab" style="width: 100%;">
+        <div style="margin-left: 2px">
+          <el-table
+            ref="tb"
+            :data="addInfo.productList"
+            border
+            class="el-tab"
+            style="width: 100%"
+          >
             <el-table-column type="index" label="序号" width="50px" />
+            
             <el-table-column prop="brandName" label="产品品牌" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.brandName }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.brandName" placeholder="请输入产品品牌">
                 </el-input> -->
-                <el-select v-if="showEdit[$index]" v-model="brandName" clearable placeholder="请输入产品品牌">
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="brandName"
+                  clearable
+                  placeholder="请输入产品品牌"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.brandCode"
@@ -237,7 +312,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="categoryIds" label="产品品类" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.categoryIds }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.categoryIds" placeholder="请输入产品品类">
                 </el-input> -->
@@ -257,8 +332,26 @@
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column prop="productName" label="产品名称" width="200px">
+              <template slot-scope="{ row, $index }">
+                <span v-if="!showEdit[$index]">{{ row.productName }}</span>
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productName"
+                  clearable
+                  placeholder="请输入产品型号"
+                >
+                  <el-option
+                    v-for="item in CodeList"
+                    :key="item.id + 1"
+                    :label="item.productName"
+                    :value="item.productName"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="productCode" label="产品型号" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productCode }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productCode" placeholder="请输入产品型号">
                 </el-input> -->
@@ -277,38 +370,63 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="productQuantity" label="产品数量" width="200px">
-              <template slot-scope="{row,$index}">
+            <el-table-column
+              prop="productQuantity"
+              label="产品数量"
+              width="200px"
+            >
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productQuantity }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productQuantity" placeholder="请输入产品数量" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productQuantity"
+                  placeholder="请输入产品数量"
+                />
               </template>
             </el-table-column>
             <el-table-column prop="productPrice" label="产品单价" width="200px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productPrice }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productPrice" placeholder="请输入产品单价" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productPrice"
+                  placeholder="请输入产品单价"
+                />
               </template>
             </el-table-column>
-            <el-table-column header-align="center" align="center" width="200" label="操作">
-              <template slot-scope="{row,$index}">
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showUpdate($index, row)">
+            <el-table-column
+              header-align="center"
+              align="center"
+              width="200"
+              label="操作"
+            >
+              <template slot-scope="{ row, $index }">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showUpdate($index, row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showDelete($index, row)">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showDelete($index, row)"
+                >
                   删除
                 </el-button>
                 <el-button
                   v-if="showEdit[$index]"
                   size="small"
-                  style="color: #85ce61;"
+                  style="color: #85ce61"
                   @click="submit($index, row)"
                 >
                   确定
                 </el-button>
                 <el-button
-                  v-if="showEdit[$index] && isFirst[$index] >1"
+                  v-if="showEdit[$index] && isFirst[$index] > 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="cancelUpdate($index)"
                 >
                   取消
@@ -316,7 +434,7 @@
                 <el-button
                   v-if="showEdit[$index] && isFirst[$index] === 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="showDelete($index)"
                 >
                   删除
@@ -327,300 +445,323 @@
         </div>
       </div>
       <div>
-          <el-button class="table-btn" @click="handleAddBtn">
-            添加项目需求
-          </el-button>
-        </div>
+        <el-button class="table-btn" @click="handleAddBtn">
+          添加项目需求
+        </el-button>
+      </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+      <el-button type="info" class="close" @click="close"> 取消 </el-button>
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { list } from '../../api/product/product'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { add } from '../../api/business/business'
-import { order_area } from '../../api/order/order'
-import { Message } from 'element-ui'
+import { list } from "../../api/product/product";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { add } from "../../api/business/business";
+import { order_area } from "../../api/order/order";
+import { Message } from "element-ui";
 export default {
   components: {
-    RedStar, inputVue
+    RedStar,
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
+      brandName: "",
+      categoryIds: "",
       CodeList: [],
       brandList: [],
       categoryList: [],
       checkedDetail: [],
       showEdit: [], // 用来判断是否处于编辑状态
-      isFirst:[], // 用来判断是否初次添加
+      isFirst: [], // 用来判断是否初次添加
       options: [
-        { value: '0', label: '推进' },
-        { value: '1', label: '成交' },
-        { value: '2', label: '丢失' }
+        { value: "0", label: "推进" },
+        { value: "1", label: "成交" },
+        { value: "2", label: "丢失" },
       ],
       addInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
-      }
-    }
+        countyList: [],
+      },
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
+        console.log(newval, oldval);
         if (!this.addInfo.itemProvince) {
-          this.addInfo.itemCity = ''
-          this.addInfo.itemArea = ''
+          this.addInfo.itemCity = "";
+          this.addInfo.itemArea = "";
         } else if (!this.addInfo.itemCity) {
-          this.addInfo.itemArea = ''
+          this.addInfo.itemArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
   },
-  mounted() {
-
-  },
+  mounted() {},
   methods: {
     save() {
-      if(this.valiateForm()){
-        this.addInfo.productList = {
-        productCode: this.addInfo.productList.productCode,
-        productQuantity: this.addInfo.productList.productQuantity,
-        productPrice: this.addInfo.productList.productPrice,
-        productName: ''
-      }
-      add(this.addInfo).then(res => {
-        this.setData()
+      if (this.valiateForm()) {
+        //   this.addInfo.productList = {
+        //   productCode: this.addInfo.productList.productCode,
+        //   productQuantity: this.addInfo.productList.productQuantity,
+        //   productPrice: this.addInfo.productList.productPrice,
+        //   productName: ''
+        // }
+        if(this.addInfo.productList.length && this.showEdit.every(item => item=== false)){
+          add(this.addInfo).then((res) => {
+          this.setData();
           this.$message({
-            message: '保存成功',
-            type: 'success'
-          })
-      }) 
+            message: "保存成功",
+            type: "success",
+          });
+        });
+        }else{
+          this.$message.error('请先添加或保存产品信息')
+        }
       } else {
         this.$message({
-            message: '请先完整填写报备信息',
-            type: 'error'
-          })
+          message: "请先完整填写报备信息",
+          type: "error",
+        });
       }
-      
     },
     close() {
-      this.setData()
+      this.setData();
     },
     provinceChange(e) {
-      console.log(e)
-      const index = this.form.provinceList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.provinceList[index].id
+      console.log(e);
+      const index = this.form.provinceList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.provinceList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(e) {
-      const index = this.form.cityList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.cityList[index].id
+      const index = this.form.cityList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.cityList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     handleAddBtn() {
-      const obj = {}
-      obj.brandName = ''
-      obj.categoryIds = ''
-      obj.productCode = ''
-      obj.productQuantity = ''
-      obj.productPrice = ''
-      this.addInfo.productList.push(obj)
-      this.showEdit[this.addInfo.productList.length-1] = true
-      this.isFirst[this.addInfo.productList.length - 1] = 1
-      C_list().then(res => {
-        console.log(res, '品类')
-        this.categoryList = res.data
-      })
-      SelectList().then(res => {
-        console.log(res, '品牌')
-        this.brandList = res
-      })
+      if (
+        this.showEdit[this.addInfo.productList.length - 1] === false ||
+        this.addInfo.productList.length === 0
+      ) {
+        const obj = {};
+        obj.brandName = "";
+        obj.categoryIds = "";
+        obj.productCode = "";
+        obj.productQuantity = "";
+        obj.productPrice = "";
+        obj.productName = "";
+        this.addInfo.productList.push(obj);
+        this.showEdit[this.addInfo.productList.length - 1] = true;
+        this.isFirst[this.addInfo.productList.length - 1] = 1;
+        C_list().then((res) => {
+          this.categoryList = res.data;
+        });
+        SelectList().then((res) => {
+          this.brandList = res;
+        });
+      } else {
+        this.$message.warning("请先保存上一次");
+      }
     },
     showUpdate(index, row) {
-      this.showEdit[index] = true
-      this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
-      this.brandName = row.brandName
-      this.categoryIds = row.categoryIds
-      this.addInfo.productList.productCode = row.productCode
-      this.addInfo.productList.productQuantity = row.productQuantity
-      this.addInfo.productList.productPrice = row.productPrice
+      this.showEdit[index] = true;
+      this.$set(this.showEdit, index, true); // 这里要用$set方法，否则页面状态不更新
+      this.brandName = row.brandName;
+      this.categoryIds = row.categoryIds;
+      this.addInfo.productList.productCode = row.productCode;
+      this.addInfo.productList.productQuantity = row.productQuantity;
+      this.addInfo.productList.productPrice = row.productPrice;
+      this.addInfo.productList.productName = row.productName;
     },
-    showDelete(index, row){
-      this.$confirm('确认删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    showDelete(index, row) {
+      this.$confirm("确认删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.addInfo.productList = this.addInfo.productList.filter((item,Index) => index!==Index)
-          this.showEdit = this.showEdit.filter((item,Index) => index!==Index)
-          this.isFirst = this.isFirst.filter((item,Index) => index!==Index)
+          this.addInfo.productList = this.addInfo.productList.filter(
+            (item, Index) => index !== Index
+          );
+          this.showEdit = this.showEdit.filter(
+            (item, Index) => index !== Index
+          );
+          this.isFirst = this.isFirst.filter((item, Index) => index !== Index);
           this.$message({
-            message: '已删除',
-            type: 'success'
-          })
+            message: "已删除",
+            type: "success",
+          });
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
+      const index = this.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      const code = this.categoryList[index].id;
+      console.log(code);
+      list({ categoryId: code }).then((res) => {
+        console.log(res);
+        this.CodeList = res;
+        // this.addInfo.productList.productName =''
+        // this.addInfo.productList.productCode =''
+      });
     },
     cancelUpdate(index) {
-      this.$confirm('取消修改？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("取消修改？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.$set(this.showEdit, index, false)
+          this.$set(this.showEdit, index, false);
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     submit(index, row) {
       // 发送请求，隐藏输入框
-      const { productCode, brandName, categoryIds, addInfo: { productList: { productQuantity, productPrice } } } = this
-      if (categoryIds&& brandName  && productQuantity && productPrice) {
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
+      const {
+        brandName,
+        categoryIds,
+        addInfo: {
+          productList: { productQuantity, productPrice },
+        },
+      } = this;
+      if (categoryIds && brandName) {
+        if (productQuantity > 0 && productPrice > 0) {
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$message({
+            type: "success",
+            message: "已缓存，记得点击保存提交修改喔！",
+            duration: 888,
+            onClose: () => {
+              this.$set(this.showEdit, index, false); // vue添加属性的方法
+            },
+          });
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$set(this.isFirst, index, 2);
+          this.brandName = "";
+          this.categoryIds = "";
+          this.addInfo.productList.productCode = "";
+          this.addInfo.productList.productQuantity = "";
+          this.addInfo.productList.productPrice = "";
+          this.addInfo.productList.productName = "";
+        } else {
+          this.$message.error("单价或数量需大于等于1");
+        }
+      } else {
         this.$message({
-          type: 'success',
-          message: '已缓存，记得点击保存提交修改喔！',
-          duration: 888,
-          onClose: () => {
-            this.$set(this.showEdit, index, false) // vue添加属性的方法
-          }
-        })
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
-        this.$set(this.isFirst, index, 2)
-        this.brandName = ''
-        this.categoryIds = ''
-        this.addInfo.productList.productCode = ''
-        this.addInfo.productList.productQuantity = ''
-        this.addInfo.productList.productPrice = ''
-      } else{
-        this.$message({
-              message: "请先完整选择或填写信息",
-              type: "error",
-            });
+          message: "请先完整选择或填写信息",
+          type: "error",
+        });
       }
     },
     setData() {
       this.addInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
+      };
     },
     valiateForm() {
-      let arr = []
-      for(var item in this.addInfo) {
-        if(this.addInfo[item]){
-          arr.push(1)
-        }else{
-          arr.push(0)
+      let arr = [];
+      for (var item in this.addInfo) {
+        if (this.addInfo[item]) {
+          arr.push(1);
+        } else {
+          arr.push(0);
         }
       }
-      return arr.every(item => item === 1)
-    }
-  }
-}
+      return arr.every((item) => item === 1);
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -673,7 +814,6 @@
     .close {
       width: 100px;
     }
-
   }
 }
 </style>
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 6638e3b..c899612 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -30,7 +30,12 @@
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
     >
-      <el-table-column prop="index" width="100px" label="序号" />
+      <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="distributorCode" width="200px" label="经销商编号" />
       <el-table-column prop="distributorName" width="400px" label="经销商名称" />
       <el-table-column prop="companyNatureName" width="150px" label="单位性质" />

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 4cae18a..25f5978 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -182,15 +182,16 @@
         temp.deliveryArea = this.AreaList[aindex].areaName;
         turnOrder(temp).then((res) => {
           this.$message.success("添加成功");
-          this.close();
+          this.$emit("close");
+          this.reset();
         });
-      }else {
-        console.log(this.valiatePhone())
-        if(this.valiatePhone() === false){
+      } else {
+        console.log(this.valiatePhone());
+        if (this.valiatePhone() === false) {
           this.$message.error("请检查手机号格式是否正确");
-        }else if(this.valiateProvince() === false){
+        } else if (this.valiateProvince() === false) {
           this.$message.error("请检查地址格式是否正确");
-        }else{
+        } else {
           this.$message.error("请正确填写信息");
         }
       }
diff --git a/src/components/mycomponent/groupPage.vue b/src/components/mycomponent/groupPage.vue
index 666edc1..372e253 100644
--- a/src/components/mycomponent/groupPage.vue
+++ b/src/components/mycomponent/groupPage.vue
@@ -1,7 +1,7 @@
 <!--分页组件-->
 <template>
   <div class="footer">
-    <div>共{{ total }}页记录 第{{ offset }}/{{ total }}页</div>
+    <div>共{{ count }}条记录 第{{ offset }}/{{ total }}页</div>
     <div>
       <el-pagination
         ref="compontentPage"
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index 4398baa..241cdd4 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -5,22 +5,48 @@
       <div class="productInput">
         项目名称
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemName" placeholder="请输入项目名称" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemName"
+            placeholder="请输入项目名称"
+            clearable
+            class="product-input"
+          />
         </div>
         项目预算
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemBudget" placeholder="请输入项目预算" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemBudget"
+            placeholder="请输入项目预算"
+            clearable
+            class="product-input"
+          />
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
+          <el-date-picker
+            v-model="selectInfo.itemDuration"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择日期"
+            class="product-input"
+          />
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
       </div>
@@ -39,14 +65,31 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
       <el-table-column prop="itemBudget" label="项目预算" />
-      <el-table-column prop="itemDuration" label="预计工期" />
+      <el-table-column prop="itemDuration" label="预计工期" >
+        <template slot-scope="{row}">
+          <span>
+           {{row.itemDuration.split(' ')[0]}}
+          </span>
+        </template>
+    </el-table-column>
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
+      <el-table-column label="项目地址">
+        <template slot-scope="{row}">
+          <span>
+            {{row.itemProvince === row.itemCity ? row.itemCity + row.itemArea  + row.itemAddress : row.itemProvince + row.itemCity + row.itemArea  + row.itemAddress}}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="handlerDetail(scope.row)">
@@ -66,64 +109,96 @@
     />
     <!-- xiangqing弹框 -->
 
-    <businessDetailDialog v-if="dialogFormVisible" :data-info="dataInfo" @close="detailClose" />
+    <businessDetailDialog
+      v-if="dialogFormVisible"
+      :data-info="dataInfo"
+      @close="detailClose"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import businessDetailDialog from '../../components/mycomponent/dialog/business/businessDetailDialog.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import businessDetailDialog from "../../components/mycomponent/dialog/business/businessDetailDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/business/business'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import { listPage } from "../../api/business/business";
+export default {
+  // 加入分页逻辑
   components: {
     GroupPage,
-    businessDetailDialog
+    businessDetailDialog,
   },
   mixins: [listMixin],
   data() {
     return {
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
       dialogFormVisible: false,
-      dataInfo: {}
-    }
+      dataInfo: {},
+    };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     tableRowClassName: tableRowClassName,
     detailClose() {
-      this.dialogFormVisible = false
+      this.dialogFormVisible = false;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     handlerDetail(row) {
-      console.log(row)
-      this.dialogFormVisible = true
-      this.dataInfo = row
-    }
-  }
-
-}
+      console.log(row);
+      this.dialogFormVisible = true;
+      this.dataInfo = row;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -184,11 +259,9 @@
     color: #6666;
     margin: 30px 10px;
   }
-
 }
 
 .order-dialog {
-
   .dialog-tab {
     .dialog-title {
       font-size: 16px;
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 7045eaf..e1c37c7 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -1,21 +1,29 @@
 <!--商机报备表单-->
 <template>
   <div class="report-container">
-    <div class="report-title">
-      基础报备
-    </div>
+    <div class="report-title">基础报备</div>
     <div class="report-from">
-      <div class="from-title">
-        基础信息
-      </div>
+      <div class="from-title">基础信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemName" title="项目名称" placeholder="请输入项目名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemName"
+            title="项目名称"
+            placeholder="请输入项目名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemBudget" title="项目预算" placeholder="请输入项目预算" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemBudget"
+            title="项目预算"
+            placeholder="请输入项目预算"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -25,7 +33,7 @@
               value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
-              style="width:380px"
+              style="width: 380px"
             />
           </inputVue>
         </div>
@@ -43,7 +51,13 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.phone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.phone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -60,8 +74,18 @@
         <div class="input-item">
           <RedStar />
           <inputVue title="商机状态" class="inputWidth">
-            <el-select v-model="addInfo.status" clearable placeholder="请选择" style="width:380px">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select
+              v-model="addInfo.status"
+              clearable
+              placeholder="请选择"
+              style="width: 380px"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </inputVue>
         </div>
@@ -72,10 +96,15 @@
               v-model="addInfo.itemProvince"
               clearable
               placeholder="省/市"
-              style="width:150px;margin-left: 55px;"
+              style="width: 150px; margin-left: 55px"
               @change="provinceChange"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -83,29 +112,53 @@
               v-model="addInfo.itemCity"
               clearable
               placeholder="市/区"
-              style="width:150px"
+              style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.itemArea" clearable placeholder="县/街道" style="width:150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+            <el-select
+              v-model="addInfo.itemArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.itemAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.itemAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        关联方信息
-      </div>
+      <div class="from-title">关联方信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.ownerName" title="业主方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.ownerName"
+            title="业主方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -131,7 +184,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.contractName" title="总包方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.contractName"
+            title="总包方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -189,7 +248,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.agentName" title="代理商名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.agentName"
+            title="代理商名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -214,19 +279,29 @@
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        产品信息
-      </div>
+      <div class="from-title">产品信息</div>
       <div class="from-table">
-        <div style="margin-left: 2px;">
-          <el-table ref="tb" :data="addInfo.productList" border class="el-tab" style="width: 100%;">
+        <div style="margin-left: 2px">
+          <el-table
+            ref="tb"
+            :data="addInfo.productList"
+            border
+            class="el-tab"
+            style="width: 100%"
+          >
             <el-table-column type="index" label="序号" width="50px" />
+            
             <el-table-column prop="brandName" label="产品品牌" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.brandName }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.brandName" placeholder="请输入产品品牌">
                 </el-input> -->
-                <el-select v-if="showEdit[$index]" v-model="brandName" clearable placeholder="请输入产品品牌">
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="brandName"
+                  clearable
+                  placeholder="请输入产品品牌"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.brandCode"
@@ -237,7 +312,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="categoryIds" label="产品品类" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.categoryIds }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.categoryIds" placeholder="请输入产品品类">
                 </el-input> -->
@@ -257,8 +332,26 @@
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column prop="productName" label="产品名称" width="200px">
+              <template slot-scope="{ row, $index }">
+                <span v-if="!showEdit[$index]">{{ row.productName }}</span>
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productName"
+                  clearable
+                  placeholder="请输入产品型号"
+                >
+                  <el-option
+                    v-for="item in CodeList"
+                    :key="item.id + 1"
+                    :label="item.productName"
+                    :value="item.productName"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="productCode" label="产品型号" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productCode }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productCode" placeholder="请输入产品型号">
                 </el-input> -->
@@ -277,38 +370,63 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="productQuantity" label="产品数量" width="200px">
-              <template slot-scope="{row,$index}">
+            <el-table-column
+              prop="productQuantity"
+              label="产品数量"
+              width="200px"
+            >
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productQuantity }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productQuantity" placeholder="请输入产品数量" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productQuantity"
+                  placeholder="请输入产品数量"
+                />
               </template>
             </el-table-column>
             <el-table-column prop="productPrice" label="产品单价" width="200px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productPrice }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productPrice" placeholder="请输入产品单价" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productPrice"
+                  placeholder="请输入产品单价"
+                />
               </template>
             </el-table-column>
-            <el-table-column header-align="center" align="center" width="200" label="操作">
-              <template slot-scope="{row,$index}">
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showUpdate($index, row)">
+            <el-table-column
+              header-align="center"
+              align="center"
+              width="200"
+              label="操作"
+            >
+              <template slot-scope="{ row, $index }">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showUpdate($index, row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showDelete($index, row)">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showDelete($index, row)"
+                >
                   删除
                 </el-button>
                 <el-button
                   v-if="showEdit[$index]"
                   size="small"
-                  style="color: #85ce61;"
+                  style="color: #85ce61"
                   @click="submit($index, row)"
                 >
                   确定
                 </el-button>
                 <el-button
-                  v-if="showEdit[$index] && isFirst[$index] >1"
+                  v-if="showEdit[$index] && isFirst[$index] > 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="cancelUpdate($index)"
                 >
                   取消
@@ -316,7 +434,7 @@
                 <el-button
                   v-if="showEdit[$index] && isFirst[$index] === 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="showDelete($index)"
                 >
                   删除
@@ -327,300 +445,323 @@
         </div>
       </div>
       <div>
-          <el-button class="table-btn" @click="handleAddBtn">
-            添加项目需求
-          </el-button>
-        </div>
+        <el-button class="table-btn" @click="handleAddBtn">
+          添加项目需求
+        </el-button>
+      </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+      <el-button type="info" class="close" @click="close"> 取消 </el-button>
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { list } from '../../api/product/product'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { add } from '../../api/business/business'
-import { order_area } from '../../api/order/order'
-import { Message } from 'element-ui'
+import { list } from "../../api/product/product";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { add } from "../../api/business/business";
+import { order_area } from "../../api/order/order";
+import { Message } from "element-ui";
 export default {
   components: {
-    RedStar, inputVue
+    RedStar,
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
+      brandName: "",
+      categoryIds: "",
       CodeList: [],
       brandList: [],
       categoryList: [],
       checkedDetail: [],
       showEdit: [], // 用来判断是否处于编辑状态
-      isFirst:[], // 用来判断是否初次添加
+      isFirst: [], // 用来判断是否初次添加
       options: [
-        { value: '0', label: '推进' },
-        { value: '1', label: '成交' },
-        { value: '2', label: '丢失' }
+        { value: "0", label: "推进" },
+        { value: "1", label: "成交" },
+        { value: "2", label: "丢失" },
       ],
       addInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
-      }
-    }
+        countyList: [],
+      },
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
+        console.log(newval, oldval);
         if (!this.addInfo.itemProvince) {
-          this.addInfo.itemCity = ''
-          this.addInfo.itemArea = ''
+          this.addInfo.itemCity = "";
+          this.addInfo.itemArea = "";
         } else if (!this.addInfo.itemCity) {
-          this.addInfo.itemArea = ''
+          this.addInfo.itemArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
   },
-  mounted() {
-
-  },
+  mounted() {},
   methods: {
     save() {
-      if(this.valiateForm()){
-        this.addInfo.productList = {
-        productCode: this.addInfo.productList.productCode,
-        productQuantity: this.addInfo.productList.productQuantity,
-        productPrice: this.addInfo.productList.productPrice,
-        productName: ''
-      }
-      add(this.addInfo).then(res => {
-        this.setData()
+      if (this.valiateForm()) {
+        //   this.addInfo.productList = {
+        //   productCode: this.addInfo.productList.productCode,
+        //   productQuantity: this.addInfo.productList.productQuantity,
+        //   productPrice: this.addInfo.productList.productPrice,
+        //   productName: ''
+        // }
+        if(this.addInfo.productList.length && this.showEdit.every(item => item=== false)){
+          add(this.addInfo).then((res) => {
+          this.setData();
           this.$message({
-            message: '保存成功',
-            type: 'success'
-          })
-      }) 
+            message: "保存成功",
+            type: "success",
+          });
+        });
+        }else{
+          this.$message.error('请先添加或保存产品信息')
+        }
       } else {
         this.$message({
-            message: '请先完整填写报备信息',
-            type: 'error'
-          })
+          message: "请先完整填写报备信息",
+          type: "error",
+        });
       }
-      
     },
     close() {
-      this.setData()
+      this.setData();
     },
     provinceChange(e) {
-      console.log(e)
-      const index = this.form.provinceList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.provinceList[index].id
+      console.log(e);
+      const index = this.form.provinceList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.provinceList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(e) {
-      const index = this.form.cityList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.cityList[index].id
+      const index = this.form.cityList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.cityList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     handleAddBtn() {
-      const obj = {}
-      obj.brandName = ''
-      obj.categoryIds = ''
-      obj.productCode = ''
-      obj.productQuantity = ''
-      obj.productPrice = ''
-      this.addInfo.productList.push(obj)
-      this.showEdit[this.addInfo.productList.length-1] = true
-      this.isFirst[this.addInfo.productList.length - 1] = 1
-      C_list().then(res => {
-        console.log(res, '品类')
-        this.categoryList = res.data
-      })
-      SelectList().then(res => {
-        console.log(res, '品牌')
-        this.brandList = res
-      })
+      if (
+        this.showEdit[this.addInfo.productList.length - 1] === false ||
+        this.addInfo.productList.length === 0
+      ) {
+        const obj = {};
+        obj.brandName = "";
+        obj.categoryIds = "";
+        obj.productCode = "";
+        obj.productQuantity = "";
+        obj.productPrice = "";
+        obj.productName = "";
+        this.addInfo.productList.push(obj);
+        this.showEdit[this.addInfo.productList.length - 1] = true;
+        this.isFirst[this.addInfo.productList.length - 1] = 1;
+        C_list().then((res) => {
+          this.categoryList = res.data;
+        });
+        SelectList().then((res) => {
+          this.brandList = res;
+        });
+      } else {
+        this.$message.warning("请先保存上一次");
+      }
     },
     showUpdate(index, row) {
-      this.showEdit[index] = true
-      this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
-      this.brandName = row.brandName
-      this.categoryIds = row.categoryIds
-      this.addInfo.productList.productCode = row.productCode
-      this.addInfo.productList.productQuantity = row.productQuantity
-      this.addInfo.productList.productPrice = row.productPrice
+      this.showEdit[index] = true;
+      this.$set(this.showEdit, index, true); // 这里要用$set方法，否则页面状态不更新
+      this.brandName = row.brandName;
+      this.categoryIds = row.categoryIds;
+      this.addInfo.productList.productCode = row.productCode;
+      this.addInfo.productList.productQuantity = row.productQuantity;
+      this.addInfo.productList.productPrice = row.productPrice;
+      this.addInfo.productList.productName = row.productName;
     },
-    showDelete(index, row){
-      this.$confirm('确认删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    showDelete(index, row) {
+      this.$confirm("确认删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.addInfo.productList = this.addInfo.productList.filter((item,Index) => index!==Index)
-          this.showEdit = this.showEdit.filter((item,Index) => index!==Index)
-          this.isFirst = this.isFirst.filter((item,Index) => index!==Index)
+          this.addInfo.productList = this.addInfo.productList.filter(
+            (item, Index) => index !== Index
+          );
+          this.showEdit = this.showEdit.filter(
+            (item, Index) => index !== Index
+          );
+          this.isFirst = this.isFirst.filter((item, Index) => index !== Index);
           this.$message({
-            message: '已删除',
-            type: 'success'
-          })
+            message: "已删除",
+            type: "success",
+          });
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
+      const index = this.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      const code = this.categoryList[index].id;
+      console.log(code);
+      list({ categoryId: code }).then((res) => {
+        console.log(res);
+        this.CodeList = res;
+        // this.addInfo.productList.productName =''
+        // this.addInfo.productList.productCode =''
+      });
     },
     cancelUpdate(index) {
-      this.$confirm('取消修改？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("取消修改？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.$set(this.showEdit, index, false)
+          this.$set(this.showEdit, index, false);
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     submit(index, row) {
       // 发送请求，隐藏输入框
-      const { productCode, brandName, categoryIds, addInfo: { productList: { productQuantity, productPrice } } } = this
-      if (categoryIds&& brandName  && productQuantity && productPrice) {
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
+      const {
+        brandName,
+        categoryIds,
+        addInfo: {
+          productList: { productQuantity, productPrice },
+        },
+      } = this;
+      if (categoryIds && brandName) {
+        if (productQuantity > 0 && productPrice > 0) {
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$message({
+            type: "success",
+            message: "已缓存，记得点击保存提交修改喔！",
+            duration: 888,
+            onClose: () => {
+              this.$set(this.showEdit, index, false); // vue添加属性的方法
+            },
+          });
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$set(this.isFirst, index, 2);
+          this.brandName = "";
+          this.categoryIds = "";
+          this.addInfo.productList.productCode = "";
+          this.addInfo.productList.productQuantity = "";
+          this.addInfo.productList.productPrice = "";
+          this.addInfo.productList.productName = "";
+        } else {
+          this.$message.error("单价或数量需大于等于1");
+        }
+      } else {
         this.$message({
-          type: 'success',
-          message: '已缓存，记得点击保存提交修改喔！',
-          duration: 888,
-          onClose: () => {
-            this.$set(this.showEdit, index, false) // vue添加属性的方法
-          }
-        })
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
-        this.$set(this.isFirst, index, 2)
-        this.brandName = ''
-        this.categoryIds = ''
-        this.addInfo.productList.productCode = ''
-        this.addInfo.productList.productQuantity = ''
-        this.addInfo.productList.productPrice = ''
-      } else{
-        this.$message({
-              message: "请先完整选择或填写信息",
-              type: "error",
-            });
+          message: "请先完整选择或填写信息",
+          type: "error",
+        });
       }
     },
     setData() {
       this.addInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
+      };
     },
     valiateForm() {
-      let arr = []
-      for(var item in this.addInfo) {
-        if(this.addInfo[item]){
-          arr.push(1)
-        }else{
-          arr.push(0)
+      let arr = [];
+      for (var item in this.addInfo) {
+        if (this.addInfo[item]) {
+          arr.push(1);
+        } else {
+          arr.push(0);
         }
       }
-      return arr.every(item => item === 1)
-    }
-  }
-}
+      return arr.every((item) => item === 1);
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -673,7 +814,6 @@
     .close {
       width: 100px;
     }
-
   }
 }
 </style>
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 6638e3b..c899612 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -30,7 +30,12 @@
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
     >
-      <el-table-column prop="index" width="100px" label="序号" />
+      <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="distributorCode" width="200px" label="经销商编号" />
       <el-table-column prop="distributorName" width="400px" label="经销商名称" />
       <el-table-column prop="companyNatureName" width="150px" label="单位性质" />
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index de08ec0..704a758 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -92,7 +92,12 @@
       style="width: 100%"
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="account" label="账号" />
       <el-table-column prop="province" label="省" />
       <el-table-column prop="city" label="市" />
@@ -176,9 +181,19 @@
     },
     reset() {
       this.selectInfo = {
-        recommendType: '',
-        recommendTitle: ''
+        account: '',
+        province: '',
+        city: '',
+        area: ''
       }
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((offset - 1) * 10)
+        })
+        this.tableData = res
+      })
+
     },
     Bdelete(row) {
       // console.log(row);

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 4cae18a..25f5978 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -182,15 +182,16 @@
         temp.deliveryArea = this.AreaList[aindex].areaName;
         turnOrder(temp).then((res) => {
           this.$message.success("添加成功");
-          this.close();
+          this.$emit("close");
+          this.reset();
         });
-      }else {
-        console.log(this.valiatePhone())
-        if(this.valiatePhone() === false){
+      } else {
+        console.log(this.valiatePhone());
+        if (this.valiatePhone() === false) {
           this.$message.error("请检查手机号格式是否正确");
-        }else if(this.valiateProvince() === false){
+        } else if (this.valiateProvince() === false) {
           this.$message.error("请检查地址格式是否正确");
-        }else{
+        } else {
           this.$message.error("请正确填写信息");
         }
       }
diff --git a/src/components/mycomponent/groupPage.vue b/src/components/mycomponent/groupPage.vue
index 666edc1..372e253 100644
--- a/src/components/mycomponent/groupPage.vue
+++ b/src/components/mycomponent/groupPage.vue
@@ -1,7 +1,7 @@
 <!--分页组件-->
 <template>
   <div class="footer">
-    <div>共{{ total }}页记录 第{{ offset }}/{{ total }}页</div>
+    <div>共{{ count }}条记录 第{{ offset }}/{{ total }}页</div>
     <div>
       <el-pagination
         ref="compontentPage"
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index 4398baa..241cdd4 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -5,22 +5,48 @@
       <div class="productInput">
         项目名称
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemName" placeholder="请输入项目名称" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemName"
+            placeholder="请输入项目名称"
+            clearable
+            class="product-input"
+          />
         </div>
         项目预算
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemBudget" placeholder="请输入项目预算" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemBudget"
+            placeholder="请输入项目预算"
+            clearable
+            class="product-input"
+          />
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
+          <el-date-picker
+            v-model="selectInfo.itemDuration"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择日期"
+            class="product-input"
+          />
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
       </div>
@@ -39,14 +65,31 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
       <el-table-column prop="itemBudget" label="项目预算" />
-      <el-table-column prop="itemDuration" label="预计工期" />
+      <el-table-column prop="itemDuration" label="预计工期" >
+        <template slot-scope="{row}">
+          <span>
+           {{row.itemDuration.split(' ')[0]}}
+          </span>
+        </template>
+    </el-table-column>
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
+      <el-table-column label="项目地址">
+        <template slot-scope="{row}">
+          <span>
+            {{row.itemProvince === row.itemCity ? row.itemCity + row.itemArea  + row.itemAddress : row.itemProvince + row.itemCity + row.itemArea  + row.itemAddress}}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="handlerDetail(scope.row)">
@@ -66,64 +109,96 @@
     />
     <!-- xiangqing弹框 -->
 
-    <businessDetailDialog v-if="dialogFormVisible" :data-info="dataInfo" @close="detailClose" />
+    <businessDetailDialog
+      v-if="dialogFormVisible"
+      :data-info="dataInfo"
+      @close="detailClose"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import businessDetailDialog from '../../components/mycomponent/dialog/business/businessDetailDialog.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import businessDetailDialog from "../../components/mycomponent/dialog/business/businessDetailDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/business/business'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import { listPage } from "../../api/business/business";
+export default {
+  // 加入分页逻辑
   components: {
     GroupPage,
-    businessDetailDialog
+    businessDetailDialog,
   },
   mixins: [listMixin],
   data() {
     return {
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
       dialogFormVisible: false,
-      dataInfo: {}
-    }
+      dataInfo: {},
+    };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     tableRowClassName: tableRowClassName,
     detailClose() {
-      this.dialogFormVisible = false
+      this.dialogFormVisible = false;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     handlerDetail(row) {
-      console.log(row)
-      this.dialogFormVisible = true
-      this.dataInfo = row
-    }
-  }
-
-}
+      console.log(row);
+      this.dialogFormVisible = true;
+      this.dataInfo = row;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -184,11 +259,9 @@
     color: #6666;
     margin: 30px 10px;
   }
-
 }
 
 .order-dialog {
-
   .dialog-tab {
     .dialog-title {
       font-size: 16px;
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 7045eaf..e1c37c7 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -1,21 +1,29 @@
 <!--商机报备表单-->
 <template>
   <div class="report-container">
-    <div class="report-title">
-      基础报备
-    </div>
+    <div class="report-title">基础报备</div>
     <div class="report-from">
-      <div class="from-title">
-        基础信息
-      </div>
+      <div class="from-title">基础信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemName" title="项目名称" placeholder="请输入项目名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemName"
+            title="项目名称"
+            placeholder="请输入项目名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemBudget" title="项目预算" placeholder="请输入项目预算" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemBudget"
+            title="项目预算"
+            placeholder="请输入项目预算"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -25,7 +33,7 @@
               value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
-              style="width:380px"
+              style="width: 380px"
             />
           </inputVue>
         </div>
@@ -43,7 +51,13 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.phone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.phone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -60,8 +74,18 @@
         <div class="input-item">
           <RedStar />
           <inputVue title="商机状态" class="inputWidth">
-            <el-select v-model="addInfo.status" clearable placeholder="请选择" style="width:380px">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select
+              v-model="addInfo.status"
+              clearable
+              placeholder="请选择"
+              style="width: 380px"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </inputVue>
         </div>
@@ -72,10 +96,15 @@
               v-model="addInfo.itemProvince"
               clearable
               placeholder="省/市"
-              style="width:150px;margin-left: 55px;"
+              style="width: 150px; margin-left: 55px"
               @change="provinceChange"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -83,29 +112,53 @@
               v-model="addInfo.itemCity"
               clearable
               placeholder="市/区"
-              style="width:150px"
+              style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.itemArea" clearable placeholder="县/街道" style="width:150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+            <el-select
+              v-model="addInfo.itemArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.itemAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.itemAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        关联方信息
-      </div>
+      <div class="from-title">关联方信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.ownerName" title="业主方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.ownerName"
+            title="业主方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -131,7 +184,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.contractName" title="总包方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.contractName"
+            title="总包方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -189,7 +248,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.agentName" title="代理商名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.agentName"
+            title="代理商名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -214,19 +279,29 @@
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        产品信息
-      </div>
+      <div class="from-title">产品信息</div>
       <div class="from-table">
-        <div style="margin-left: 2px;">
-          <el-table ref="tb" :data="addInfo.productList" border class="el-tab" style="width: 100%;">
+        <div style="margin-left: 2px">
+          <el-table
+            ref="tb"
+            :data="addInfo.productList"
+            border
+            class="el-tab"
+            style="width: 100%"
+          >
             <el-table-column type="index" label="序号" width="50px" />
+            
             <el-table-column prop="brandName" label="产品品牌" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.brandName }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.brandName" placeholder="请输入产品品牌">
                 </el-input> -->
-                <el-select v-if="showEdit[$index]" v-model="brandName" clearable placeholder="请输入产品品牌">
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="brandName"
+                  clearable
+                  placeholder="请输入产品品牌"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.brandCode"
@@ -237,7 +312,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="categoryIds" label="产品品类" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.categoryIds }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.categoryIds" placeholder="请输入产品品类">
                 </el-input> -->
@@ -257,8 +332,26 @@
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column prop="productName" label="产品名称" width="200px">
+              <template slot-scope="{ row, $index }">
+                <span v-if="!showEdit[$index]">{{ row.productName }}</span>
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productName"
+                  clearable
+                  placeholder="请输入产品型号"
+                >
+                  <el-option
+                    v-for="item in CodeList"
+                    :key="item.id + 1"
+                    :label="item.productName"
+                    :value="item.productName"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="productCode" label="产品型号" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productCode }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productCode" placeholder="请输入产品型号">
                 </el-input> -->
@@ -277,38 +370,63 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="productQuantity" label="产品数量" width="200px">
-              <template slot-scope="{row,$index}">
+            <el-table-column
+              prop="productQuantity"
+              label="产品数量"
+              width="200px"
+            >
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productQuantity }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productQuantity" placeholder="请输入产品数量" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productQuantity"
+                  placeholder="请输入产品数量"
+                />
               </template>
             </el-table-column>
             <el-table-column prop="productPrice" label="产品单价" width="200px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productPrice }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productPrice" placeholder="请输入产品单价" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productPrice"
+                  placeholder="请输入产品单价"
+                />
               </template>
             </el-table-column>
-            <el-table-column header-align="center" align="center" width="200" label="操作">
-              <template slot-scope="{row,$index}">
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showUpdate($index, row)">
+            <el-table-column
+              header-align="center"
+              align="center"
+              width="200"
+              label="操作"
+            >
+              <template slot-scope="{ row, $index }">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showUpdate($index, row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showDelete($index, row)">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showDelete($index, row)"
+                >
                   删除
                 </el-button>
                 <el-button
                   v-if="showEdit[$index]"
                   size="small"
-                  style="color: #85ce61;"
+                  style="color: #85ce61"
                   @click="submit($index, row)"
                 >
                   确定
                 </el-button>
                 <el-button
-                  v-if="showEdit[$index] && isFirst[$index] >1"
+                  v-if="showEdit[$index] && isFirst[$index] > 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="cancelUpdate($index)"
                 >
                   取消
@@ -316,7 +434,7 @@
                 <el-button
                   v-if="showEdit[$index] && isFirst[$index] === 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="showDelete($index)"
                 >
                   删除
@@ -327,300 +445,323 @@
         </div>
       </div>
       <div>
-          <el-button class="table-btn" @click="handleAddBtn">
-            添加项目需求
-          </el-button>
-        </div>
+        <el-button class="table-btn" @click="handleAddBtn">
+          添加项目需求
+        </el-button>
+      </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+      <el-button type="info" class="close" @click="close"> 取消 </el-button>
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { list } from '../../api/product/product'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { add } from '../../api/business/business'
-import { order_area } from '../../api/order/order'
-import { Message } from 'element-ui'
+import { list } from "../../api/product/product";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { add } from "../../api/business/business";
+import { order_area } from "../../api/order/order";
+import { Message } from "element-ui";
 export default {
   components: {
-    RedStar, inputVue
+    RedStar,
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
+      brandName: "",
+      categoryIds: "",
       CodeList: [],
       brandList: [],
       categoryList: [],
       checkedDetail: [],
       showEdit: [], // 用来判断是否处于编辑状态
-      isFirst:[], // 用来判断是否初次添加
+      isFirst: [], // 用来判断是否初次添加
       options: [
-        { value: '0', label: '推进' },
-        { value: '1', label: '成交' },
-        { value: '2', label: '丢失' }
+        { value: "0", label: "推进" },
+        { value: "1", label: "成交" },
+        { value: "2", label: "丢失" },
       ],
       addInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
-      }
-    }
+        countyList: [],
+      },
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
+        console.log(newval, oldval);
         if (!this.addInfo.itemProvince) {
-          this.addInfo.itemCity = ''
-          this.addInfo.itemArea = ''
+          this.addInfo.itemCity = "";
+          this.addInfo.itemArea = "";
         } else if (!this.addInfo.itemCity) {
-          this.addInfo.itemArea = ''
+          this.addInfo.itemArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
   },
-  mounted() {
-
-  },
+  mounted() {},
   methods: {
     save() {
-      if(this.valiateForm()){
-        this.addInfo.productList = {
-        productCode: this.addInfo.productList.productCode,
-        productQuantity: this.addInfo.productList.productQuantity,
-        productPrice: this.addInfo.productList.productPrice,
-        productName: ''
-      }
-      add(this.addInfo).then(res => {
-        this.setData()
+      if (this.valiateForm()) {
+        //   this.addInfo.productList = {
+        //   productCode: this.addInfo.productList.productCode,
+        //   productQuantity: this.addInfo.productList.productQuantity,
+        //   productPrice: this.addInfo.productList.productPrice,
+        //   productName: ''
+        // }
+        if(this.addInfo.productList.length && this.showEdit.every(item => item=== false)){
+          add(this.addInfo).then((res) => {
+          this.setData();
           this.$message({
-            message: '保存成功',
-            type: 'success'
-          })
-      }) 
+            message: "保存成功",
+            type: "success",
+          });
+        });
+        }else{
+          this.$message.error('请先添加或保存产品信息')
+        }
       } else {
         this.$message({
-            message: '请先完整填写报备信息',
-            type: 'error'
-          })
+          message: "请先完整填写报备信息",
+          type: "error",
+        });
       }
-      
     },
     close() {
-      this.setData()
+      this.setData();
     },
     provinceChange(e) {
-      console.log(e)
-      const index = this.form.provinceList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.provinceList[index].id
+      console.log(e);
+      const index = this.form.provinceList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.provinceList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(e) {
-      const index = this.form.cityList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.cityList[index].id
+      const index = this.form.cityList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.cityList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     handleAddBtn() {
-      const obj = {}
-      obj.brandName = ''
-      obj.categoryIds = ''
-      obj.productCode = ''
-      obj.productQuantity = ''
-      obj.productPrice = ''
-      this.addInfo.productList.push(obj)
-      this.showEdit[this.addInfo.productList.length-1] = true
-      this.isFirst[this.addInfo.productList.length - 1] = 1
-      C_list().then(res => {
-        console.log(res, '品类')
-        this.categoryList = res.data
-      })
-      SelectList().then(res => {
-        console.log(res, '品牌')
-        this.brandList = res
-      })
+      if (
+        this.showEdit[this.addInfo.productList.length - 1] === false ||
+        this.addInfo.productList.length === 0
+      ) {
+        const obj = {};
+        obj.brandName = "";
+        obj.categoryIds = "";
+        obj.productCode = "";
+        obj.productQuantity = "";
+        obj.productPrice = "";
+        obj.productName = "";
+        this.addInfo.productList.push(obj);
+        this.showEdit[this.addInfo.productList.length - 1] = true;
+        this.isFirst[this.addInfo.productList.length - 1] = 1;
+        C_list().then((res) => {
+          this.categoryList = res.data;
+        });
+        SelectList().then((res) => {
+          this.brandList = res;
+        });
+      } else {
+        this.$message.warning("请先保存上一次");
+      }
     },
     showUpdate(index, row) {
-      this.showEdit[index] = true
-      this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
-      this.brandName = row.brandName
-      this.categoryIds = row.categoryIds
-      this.addInfo.productList.productCode = row.productCode
-      this.addInfo.productList.productQuantity = row.productQuantity
-      this.addInfo.productList.productPrice = row.productPrice
+      this.showEdit[index] = true;
+      this.$set(this.showEdit, index, true); // 这里要用$set方法，否则页面状态不更新
+      this.brandName = row.brandName;
+      this.categoryIds = row.categoryIds;
+      this.addInfo.productList.productCode = row.productCode;
+      this.addInfo.productList.productQuantity = row.productQuantity;
+      this.addInfo.productList.productPrice = row.productPrice;
+      this.addInfo.productList.productName = row.productName;
     },
-    showDelete(index, row){
-      this.$confirm('确认删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    showDelete(index, row) {
+      this.$confirm("确认删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.addInfo.productList = this.addInfo.productList.filter((item,Index) => index!==Index)
-          this.showEdit = this.showEdit.filter((item,Index) => index!==Index)
-          this.isFirst = this.isFirst.filter((item,Index) => index!==Index)
+          this.addInfo.productList = this.addInfo.productList.filter(
+            (item, Index) => index !== Index
+          );
+          this.showEdit = this.showEdit.filter(
+            (item, Index) => index !== Index
+          );
+          this.isFirst = this.isFirst.filter((item, Index) => index !== Index);
           this.$message({
-            message: '已删除',
-            type: 'success'
-          })
+            message: "已删除",
+            type: "success",
+          });
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
+      const index = this.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      const code = this.categoryList[index].id;
+      console.log(code);
+      list({ categoryId: code }).then((res) => {
+        console.log(res);
+        this.CodeList = res;
+        // this.addInfo.productList.productName =''
+        // this.addInfo.productList.productCode =''
+      });
     },
     cancelUpdate(index) {
-      this.$confirm('取消修改？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("取消修改？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.$set(this.showEdit, index, false)
+          this.$set(this.showEdit, index, false);
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     submit(index, row) {
       // 发送请求，隐藏输入框
-      const { productCode, brandName, categoryIds, addInfo: { productList: { productQuantity, productPrice } } } = this
-      if (categoryIds&& brandName  && productQuantity && productPrice) {
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
+      const {
+        brandName,
+        categoryIds,
+        addInfo: {
+          productList: { productQuantity, productPrice },
+        },
+      } = this;
+      if (categoryIds && brandName) {
+        if (productQuantity > 0 && productPrice > 0) {
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$message({
+            type: "success",
+            message: "已缓存，记得点击保存提交修改喔！",
+            duration: 888,
+            onClose: () => {
+              this.$set(this.showEdit, index, false); // vue添加属性的方法
+            },
+          });
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$set(this.isFirst, index, 2);
+          this.brandName = "";
+          this.categoryIds = "";
+          this.addInfo.productList.productCode = "";
+          this.addInfo.productList.productQuantity = "";
+          this.addInfo.productList.productPrice = "";
+          this.addInfo.productList.productName = "";
+        } else {
+          this.$message.error("单价或数量需大于等于1");
+        }
+      } else {
         this.$message({
-          type: 'success',
-          message: '已缓存，记得点击保存提交修改喔！',
-          duration: 888,
-          onClose: () => {
-            this.$set(this.showEdit, index, false) // vue添加属性的方法
-          }
-        })
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
-        this.$set(this.isFirst, index, 2)
-        this.brandName = ''
-        this.categoryIds = ''
-        this.addInfo.productList.productCode = ''
-        this.addInfo.productList.productQuantity = ''
-        this.addInfo.productList.productPrice = ''
-      } else{
-        this.$message({
-              message: "请先完整选择或填写信息",
-              type: "error",
-            });
+          message: "请先完整选择或填写信息",
+          type: "error",
+        });
       }
     },
     setData() {
       this.addInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
+      };
     },
     valiateForm() {
-      let arr = []
-      for(var item in this.addInfo) {
-        if(this.addInfo[item]){
-          arr.push(1)
-        }else{
-          arr.push(0)
+      let arr = [];
+      for (var item in this.addInfo) {
+        if (this.addInfo[item]) {
+          arr.push(1);
+        } else {
+          arr.push(0);
         }
       }
-      return arr.every(item => item === 1)
-    }
-  }
-}
+      return arr.every((item) => item === 1);
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -673,7 +814,6 @@
     .close {
       width: 100px;
     }
-
   }
 }
 </style>
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 6638e3b..c899612 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -30,7 +30,12 @@
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
     >
-      <el-table-column prop="index" width="100px" label="序号" />
+      <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="distributorCode" width="200px" label="经销商编号" />
       <el-table-column prop="distributorName" width="400px" label="经销商名称" />
       <el-table-column prop="companyNatureName" width="150px" label="单位性质" />
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index de08ec0..704a758 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -92,7 +92,12 @@
       style="width: 100%"
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="account" label="账号" />
       <el-table-column prop="province" label="省" />
       <el-table-column prop="city" label="市" />
@@ -176,9 +181,19 @@
     },
     reset() {
       this.selectInfo = {
-        recommendType: '',
-        recommendTitle: ''
+        account: '',
+        province: '',
+        city: '',
+        area: ''
       }
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((offset - 1) * 10)
+        })
+        this.tableData = res
+      })
+
     },
     Bdelete(row) {
       // console.log(row);
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index ae070d5..5cc02cf 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -55,6 +55,11 @@
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
       <el-table-column prop="date" label="序号" />
+      <!-- <el-table-column type="index" label="序号" > -->
+      <!-- <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column> -->
       <el-table-column prop="name" label="账号" />
       <el-table-column prop="address" label="用户名" />
       <el-table-column prop="address1" label="姓名" />

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 4cae18a..25f5978 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -182,15 +182,16 @@
         temp.deliveryArea = this.AreaList[aindex].areaName;
         turnOrder(temp).then((res) => {
           this.$message.success("添加成功");
-          this.close();
+          this.$emit("close");
+          this.reset();
         });
-      }else {
-        console.log(this.valiatePhone())
-        if(this.valiatePhone() === false){
+      } else {
+        console.log(this.valiatePhone());
+        if (this.valiatePhone() === false) {
           this.$message.error("请检查手机号格式是否正确");
-        }else if(this.valiateProvince() === false){
+        } else if (this.valiateProvince() === false) {
           this.$message.error("请检查地址格式是否正确");
-        }else{
+        } else {
           this.$message.error("请正确填写信息");
         }
       }
diff --git a/src/components/mycomponent/groupPage.vue b/src/components/mycomponent/groupPage.vue
index 666edc1..372e253 100644
--- a/src/components/mycomponent/groupPage.vue
+++ b/src/components/mycomponent/groupPage.vue
@@ -1,7 +1,7 @@
 <!--分页组件-->
 <template>
   <div class="footer">
-    <div>共{{ total }}页记录 第{{ offset }}/{{ total }}页</div>
+    <div>共{{ count }}条记录 第{{ offset }}/{{ total }}页</div>
     <div>
       <el-pagination
         ref="compontentPage"
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index 4398baa..241cdd4 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -5,22 +5,48 @@
       <div class="productInput">
         项目名称
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemName" placeholder="请输入项目名称" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemName"
+            placeholder="请输入项目名称"
+            clearable
+            class="product-input"
+          />
         </div>
         项目预算
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemBudget" placeholder="请输入项目预算" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemBudget"
+            placeholder="请输入项目预算"
+            clearable
+            class="product-input"
+          />
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
+          <el-date-picker
+            v-model="selectInfo.itemDuration"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择日期"
+            class="product-input"
+          />
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
       </div>
@@ -39,14 +65,31 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
       <el-table-column prop="itemBudget" label="项目预算" />
-      <el-table-column prop="itemDuration" label="预计工期" />
+      <el-table-column prop="itemDuration" label="预计工期" >
+        <template slot-scope="{row}">
+          <span>
+           {{row.itemDuration.split(' ')[0]}}
+          </span>
+        </template>
+    </el-table-column>
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
+      <el-table-column label="项目地址">
+        <template slot-scope="{row}">
+          <span>
+            {{row.itemProvince === row.itemCity ? row.itemCity + row.itemArea  + row.itemAddress : row.itemProvince + row.itemCity + row.itemArea  + row.itemAddress}}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="handlerDetail(scope.row)">
@@ -66,64 +109,96 @@
     />
     <!-- xiangqing弹框 -->
 
-    <businessDetailDialog v-if="dialogFormVisible" :data-info="dataInfo" @close="detailClose" />
+    <businessDetailDialog
+      v-if="dialogFormVisible"
+      :data-info="dataInfo"
+      @close="detailClose"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import businessDetailDialog from '../../components/mycomponent/dialog/business/businessDetailDialog.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import businessDetailDialog from "../../components/mycomponent/dialog/business/businessDetailDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/business/business'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import { listPage } from "../../api/business/business";
+export default {
+  // 加入分页逻辑
   components: {
     GroupPage,
-    businessDetailDialog
+    businessDetailDialog,
   },
   mixins: [listMixin],
   data() {
     return {
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
       dialogFormVisible: false,
-      dataInfo: {}
-    }
+      dataInfo: {},
+    };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     tableRowClassName: tableRowClassName,
     detailClose() {
-      this.dialogFormVisible = false
+      this.dialogFormVisible = false;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     handlerDetail(row) {
-      console.log(row)
-      this.dialogFormVisible = true
-      this.dataInfo = row
-    }
-  }
-
-}
+      console.log(row);
+      this.dialogFormVisible = true;
+      this.dataInfo = row;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -184,11 +259,9 @@
     color: #6666;
     margin: 30px 10px;
   }
-
 }
 
 .order-dialog {
-
   .dialog-tab {
     .dialog-title {
       font-size: 16px;
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 7045eaf..e1c37c7 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -1,21 +1,29 @@
 <!--商机报备表单-->
 <template>
   <div class="report-container">
-    <div class="report-title">
-      基础报备
-    </div>
+    <div class="report-title">基础报备</div>
     <div class="report-from">
-      <div class="from-title">
-        基础信息
-      </div>
+      <div class="from-title">基础信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemName" title="项目名称" placeholder="请输入项目名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemName"
+            title="项目名称"
+            placeholder="请输入项目名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemBudget" title="项目预算" placeholder="请输入项目预算" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemBudget"
+            title="项目预算"
+            placeholder="请输入项目预算"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -25,7 +33,7 @@
               value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
-              style="width:380px"
+              style="width: 380px"
             />
           </inputVue>
         </div>
@@ -43,7 +51,13 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.phone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.phone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -60,8 +74,18 @@
         <div class="input-item">
           <RedStar />
           <inputVue title="商机状态" class="inputWidth">
-            <el-select v-model="addInfo.status" clearable placeholder="请选择" style="width:380px">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select
+              v-model="addInfo.status"
+              clearable
+              placeholder="请选择"
+              style="width: 380px"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </inputVue>
         </div>
@@ -72,10 +96,15 @@
               v-model="addInfo.itemProvince"
               clearable
               placeholder="省/市"
-              style="width:150px;margin-left: 55px;"
+              style="width: 150px; margin-left: 55px"
               @change="provinceChange"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -83,29 +112,53 @@
               v-model="addInfo.itemCity"
               clearable
               placeholder="市/区"
-              style="width:150px"
+              style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.itemArea" clearable placeholder="县/街道" style="width:150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+            <el-select
+              v-model="addInfo.itemArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.itemAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.itemAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        关联方信息
-      </div>
+      <div class="from-title">关联方信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.ownerName" title="业主方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.ownerName"
+            title="业主方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -131,7 +184,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.contractName" title="总包方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.contractName"
+            title="总包方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -189,7 +248,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.agentName" title="代理商名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.agentName"
+            title="代理商名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -214,19 +279,29 @@
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        产品信息
-      </div>
+      <div class="from-title">产品信息</div>
       <div class="from-table">
-        <div style="margin-left: 2px;">
-          <el-table ref="tb" :data="addInfo.productList" border class="el-tab" style="width: 100%;">
+        <div style="margin-left: 2px">
+          <el-table
+            ref="tb"
+            :data="addInfo.productList"
+            border
+            class="el-tab"
+            style="width: 100%"
+          >
             <el-table-column type="index" label="序号" width="50px" />
+            
             <el-table-column prop="brandName" label="产品品牌" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.brandName }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.brandName" placeholder="请输入产品品牌">
                 </el-input> -->
-                <el-select v-if="showEdit[$index]" v-model="brandName" clearable placeholder="请输入产品品牌">
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="brandName"
+                  clearable
+                  placeholder="请输入产品品牌"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.brandCode"
@@ -237,7 +312,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="categoryIds" label="产品品类" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.categoryIds }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.categoryIds" placeholder="请输入产品品类">
                 </el-input> -->
@@ -257,8 +332,26 @@
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column prop="productName" label="产品名称" width="200px">
+              <template slot-scope="{ row, $index }">
+                <span v-if="!showEdit[$index]">{{ row.productName }}</span>
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productName"
+                  clearable
+                  placeholder="请输入产品型号"
+                >
+                  <el-option
+                    v-for="item in CodeList"
+                    :key="item.id + 1"
+                    :label="item.productName"
+                    :value="item.productName"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="productCode" label="产品型号" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productCode }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productCode" placeholder="请输入产品型号">
                 </el-input> -->
@@ -277,38 +370,63 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="productQuantity" label="产品数量" width="200px">
-              <template slot-scope="{row,$index}">
+            <el-table-column
+              prop="productQuantity"
+              label="产品数量"
+              width="200px"
+            >
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productQuantity }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productQuantity" placeholder="请输入产品数量" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productQuantity"
+                  placeholder="请输入产品数量"
+                />
               </template>
             </el-table-column>
             <el-table-column prop="productPrice" label="产品单价" width="200px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productPrice }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productPrice" placeholder="请输入产品单价" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productPrice"
+                  placeholder="请输入产品单价"
+                />
               </template>
             </el-table-column>
-            <el-table-column header-align="center" align="center" width="200" label="操作">
-              <template slot-scope="{row,$index}">
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showUpdate($index, row)">
+            <el-table-column
+              header-align="center"
+              align="center"
+              width="200"
+              label="操作"
+            >
+              <template slot-scope="{ row, $index }">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showUpdate($index, row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showDelete($index, row)">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showDelete($index, row)"
+                >
                   删除
                 </el-button>
                 <el-button
                   v-if="showEdit[$index]"
                   size="small"
-                  style="color: #85ce61;"
+                  style="color: #85ce61"
                   @click="submit($index, row)"
                 >
                   确定
                 </el-button>
                 <el-button
-                  v-if="showEdit[$index] && isFirst[$index] >1"
+                  v-if="showEdit[$index] && isFirst[$index] > 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="cancelUpdate($index)"
                 >
                   取消
@@ -316,7 +434,7 @@
                 <el-button
                   v-if="showEdit[$index] && isFirst[$index] === 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="showDelete($index)"
                 >
                   删除
@@ -327,300 +445,323 @@
         </div>
       </div>
       <div>
-          <el-button class="table-btn" @click="handleAddBtn">
-            添加项目需求
-          </el-button>
-        </div>
+        <el-button class="table-btn" @click="handleAddBtn">
+          添加项目需求
+        </el-button>
+      </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+      <el-button type="info" class="close" @click="close"> 取消 </el-button>
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { list } from '../../api/product/product'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { add } from '../../api/business/business'
-import { order_area } from '../../api/order/order'
-import { Message } from 'element-ui'
+import { list } from "../../api/product/product";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { add } from "../../api/business/business";
+import { order_area } from "../../api/order/order";
+import { Message } from "element-ui";
 export default {
   components: {
-    RedStar, inputVue
+    RedStar,
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
+      brandName: "",
+      categoryIds: "",
       CodeList: [],
       brandList: [],
       categoryList: [],
       checkedDetail: [],
       showEdit: [], // 用来判断是否处于编辑状态
-      isFirst:[], // 用来判断是否初次添加
+      isFirst: [], // 用来判断是否初次添加
       options: [
-        { value: '0', label: '推进' },
-        { value: '1', label: '成交' },
-        { value: '2', label: '丢失' }
+        { value: "0", label: "推进" },
+        { value: "1", label: "成交" },
+        { value: "2", label: "丢失" },
       ],
       addInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
-      }
-    }
+        countyList: [],
+      },
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
+        console.log(newval, oldval);
         if (!this.addInfo.itemProvince) {
-          this.addInfo.itemCity = ''
-          this.addInfo.itemArea = ''
+          this.addInfo.itemCity = "";
+          this.addInfo.itemArea = "";
         } else if (!this.addInfo.itemCity) {
-          this.addInfo.itemArea = ''
+          this.addInfo.itemArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
   },
-  mounted() {
-
-  },
+  mounted() {},
   methods: {
     save() {
-      if(this.valiateForm()){
-        this.addInfo.productList = {
-        productCode: this.addInfo.productList.productCode,
-        productQuantity: this.addInfo.productList.productQuantity,
-        productPrice: this.addInfo.productList.productPrice,
-        productName: ''
-      }
-      add(this.addInfo).then(res => {
-        this.setData()
+      if (this.valiateForm()) {
+        //   this.addInfo.productList = {
+        //   productCode: this.addInfo.productList.productCode,
+        //   productQuantity: this.addInfo.productList.productQuantity,
+        //   productPrice: this.addInfo.productList.productPrice,
+        //   productName: ''
+        // }
+        if(this.addInfo.productList.length && this.showEdit.every(item => item=== false)){
+          add(this.addInfo).then((res) => {
+          this.setData();
           this.$message({
-            message: '保存成功',
-            type: 'success'
-          })
-      }) 
+            message: "保存成功",
+            type: "success",
+          });
+        });
+        }else{
+          this.$message.error('请先添加或保存产品信息')
+        }
       } else {
         this.$message({
-            message: '请先完整填写报备信息',
-            type: 'error'
-          })
+          message: "请先完整填写报备信息",
+          type: "error",
+        });
       }
-      
     },
     close() {
-      this.setData()
+      this.setData();
     },
     provinceChange(e) {
-      console.log(e)
-      const index = this.form.provinceList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.provinceList[index].id
+      console.log(e);
+      const index = this.form.provinceList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.provinceList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(e) {
-      const index = this.form.cityList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.cityList[index].id
+      const index = this.form.cityList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.cityList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     handleAddBtn() {
-      const obj = {}
-      obj.brandName = ''
-      obj.categoryIds = ''
-      obj.productCode = ''
-      obj.productQuantity = ''
-      obj.productPrice = ''
-      this.addInfo.productList.push(obj)
-      this.showEdit[this.addInfo.productList.length-1] = true
-      this.isFirst[this.addInfo.productList.length - 1] = 1
-      C_list().then(res => {
-        console.log(res, '品类')
-        this.categoryList = res.data
-      })
-      SelectList().then(res => {
-        console.log(res, '品牌')
-        this.brandList = res
-      })
+      if (
+        this.showEdit[this.addInfo.productList.length - 1] === false ||
+        this.addInfo.productList.length === 0
+      ) {
+        const obj = {};
+        obj.brandName = "";
+        obj.categoryIds = "";
+        obj.productCode = "";
+        obj.productQuantity = "";
+        obj.productPrice = "";
+        obj.productName = "";
+        this.addInfo.productList.push(obj);
+        this.showEdit[this.addInfo.productList.length - 1] = true;
+        this.isFirst[this.addInfo.productList.length - 1] = 1;
+        C_list().then((res) => {
+          this.categoryList = res.data;
+        });
+        SelectList().then((res) => {
+          this.brandList = res;
+        });
+      } else {
+        this.$message.warning("请先保存上一次");
+      }
     },
     showUpdate(index, row) {
-      this.showEdit[index] = true
-      this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
-      this.brandName = row.brandName
-      this.categoryIds = row.categoryIds
-      this.addInfo.productList.productCode = row.productCode
-      this.addInfo.productList.productQuantity = row.productQuantity
-      this.addInfo.productList.productPrice = row.productPrice
+      this.showEdit[index] = true;
+      this.$set(this.showEdit, index, true); // 这里要用$set方法，否则页面状态不更新
+      this.brandName = row.brandName;
+      this.categoryIds = row.categoryIds;
+      this.addInfo.productList.productCode = row.productCode;
+      this.addInfo.productList.productQuantity = row.productQuantity;
+      this.addInfo.productList.productPrice = row.productPrice;
+      this.addInfo.productList.productName = row.productName;
     },
-    showDelete(index, row){
-      this.$confirm('确认删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    showDelete(index, row) {
+      this.$confirm("确认删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.addInfo.productList = this.addInfo.productList.filter((item,Index) => index!==Index)
-          this.showEdit = this.showEdit.filter((item,Index) => index!==Index)
-          this.isFirst = this.isFirst.filter((item,Index) => index!==Index)
+          this.addInfo.productList = this.addInfo.productList.filter(
+            (item, Index) => index !== Index
+          );
+          this.showEdit = this.showEdit.filter(
+            (item, Index) => index !== Index
+          );
+          this.isFirst = this.isFirst.filter((item, Index) => index !== Index);
           this.$message({
-            message: '已删除',
-            type: 'success'
-          })
+            message: "已删除",
+            type: "success",
+          });
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
+      const index = this.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      const code = this.categoryList[index].id;
+      console.log(code);
+      list({ categoryId: code }).then((res) => {
+        console.log(res);
+        this.CodeList = res;
+        // this.addInfo.productList.productName =''
+        // this.addInfo.productList.productCode =''
+      });
     },
     cancelUpdate(index) {
-      this.$confirm('取消修改？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("取消修改？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.$set(this.showEdit, index, false)
+          this.$set(this.showEdit, index, false);
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     submit(index, row) {
       // 发送请求，隐藏输入框
-      const { productCode, brandName, categoryIds, addInfo: { productList: { productQuantity, productPrice } } } = this
-      if (categoryIds&& brandName  && productQuantity && productPrice) {
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
+      const {
+        brandName,
+        categoryIds,
+        addInfo: {
+          productList: { productQuantity, productPrice },
+        },
+      } = this;
+      if (categoryIds && brandName) {
+        if (productQuantity > 0 && productPrice > 0) {
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$message({
+            type: "success",
+            message: "已缓存，记得点击保存提交修改喔！",
+            duration: 888,
+            onClose: () => {
+              this.$set(this.showEdit, index, false); // vue添加属性的方法
+            },
+          });
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$set(this.isFirst, index, 2);
+          this.brandName = "";
+          this.categoryIds = "";
+          this.addInfo.productList.productCode = "";
+          this.addInfo.productList.productQuantity = "";
+          this.addInfo.productList.productPrice = "";
+          this.addInfo.productList.productName = "";
+        } else {
+          this.$message.error("单价或数量需大于等于1");
+        }
+      } else {
         this.$message({
-          type: 'success',
-          message: '已缓存，记得点击保存提交修改喔！',
-          duration: 888,
-          onClose: () => {
-            this.$set(this.showEdit, index, false) // vue添加属性的方法
-          }
-        })
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
-        this.$set(this.isFirst, index, 2)
-        this.brandName = ''
-        this.categoryIds = ''
-        this.addInfo.productList.productCode = ''
-        this.addInfo.productList.productQuantity = ''
-        this.addInfo.productList.productPrice = ''
-      } else{
-        this.$message({
-              message: "请先完整选择或填写信息",
-              type: "error",
-            });
+          message: "请先完整选择或填写信息",
+          type: "error",
+        });
       }
     },
     setData() {
       this.addInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
+      };
     },
     valiateForm() {
-      let arr = []
-      for(var item in this.addInfo) {
-        if(this.addInfo[item]){
-          arr.push(1)
-        }else{
-          arr.push(0)
+      let arr = [];
+      for (var item in this.addInfo) {
+        if (this.addInfo[item]) {
+          arr.push(1);
+        } else {
+          arr.push(0);
         }
       }
-      return arr.every(item => item === 1)
-    }
-  }
-}
+      return arr.every((item) => item === 1);
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -673,7 +814,6 @@
     .close {
       width: 100px;
     }
-
   }
 }
 </style>
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 6638e3b..c899612 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -30,7 +30,12 @@
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
     >
-      <el-table-column prop="index" width="100px" label="序号" />
+      <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="distributorCode" width="200px" label="经销商编号" />
       <el-table-column prop="distributorName" width="400px" label="经销商名称" />
       <el-table-column prop="companyNatureName" width="150px" label="单位性质" />
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index de08ec0..704a758 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -92,7 +92,12 @@
       style="width: 100%"
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="account" label="账号" />
       <el-table-column prop="province" label="省" />
       <el-table-column prop="city" label="市" />
@@ -176,9 +181,19 @@
     },
     reset() {
       this.selectInfo = {
-        recommendType: '',
-        recommendTitle: ''
+        account: '',
+        province: '',
+        city: '',
+        area: ''
       }
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((offset - 1) * 10)
+        })
+        this.tableData = res
+      })
+
     },
     Bdelete(row) {
       // console.log(row);
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index ae070d5..5cc02cf 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -55,6 +55,11 @@
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
       <el-table-column prop="date" label="序号" />
+      <!-- <el-table-column type="index" label="序号" > -->
+      <!-- <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column> -->
       <el-table-column prop="name" label="账号" />
       <el-table-column prop="address" label="用户名" />
       <el-table-column prop="address1" label="姓名" />
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index cc4041f..94f52ad 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -76,6 +76,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
+          @click="batchDelete"
         >
           删除
         </el-button>
@@ -91,9 +92,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      ref="multipleTable"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="messageCode" label="消息编号" />
       <el-table-column prop="messageTitle" label="消息标题" />
       <el-table-column prop="messageContent" label="消息内容" />
@@ -106,6 +113,7 @@
           <el-button
             type="text"
             size="small"
+            @click="remove(scope.row)"
           >
             删除
           </el-button>
@@ -127,7 +135,7 @@
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/move/message'
+import { listPage ,deleteBatch ,deleteInfo} from '../../api/move/message'
 export default { // 加入分页逻辑
   components: {
     MassageAddDialog,
@@ -184,6 +192,44 @@
       this.isShowAdd = true
       this.title = '消息推送编辑'
       this.$refs.addMessage.init(row)
+    },
+    // 批量删除
+    batchDelete(){
+      if(this.$refs.multipleTable.selection.length){
+        this.$confirm(`确认删除选中的这些数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+         //  得到选中行
+         const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            deleteBatch({ ids: ids }).then((res) => {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+              });
+              this.refresh();
+            });
+      }).catch(()=>{})
+      }else{
+        this.$message.error('请先选择需要删除的消息记录')
+      }
+    },
+    remove(row){
+      this.$confirm(`确认删除此项数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+        deleteInfo({id:row.id}).then(()=>{
+          this.$message.success('操作成功')
+          this.refresh();
+        })
+      }).catch(()=>{})
     }
   }
 }

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 4cae18a..25f5978 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -182,15 +182,16 @@
         temp.deliveryArea = this.AreaList[aindex].areaName;
         turnOrder(temp).then((res) => {
           this.$message.success("添加成功");
-          this.close();
+          this.$emit("close");
+          this.reset();
         });
-      }else {
-        console.log(this.valiatePhone())
-        if(this.valiatePhone() === false){
+      } else {
+        console.log(this.valiatePhone());
+        if (this.valiatePhone() === false) {
           this.$message.error("请检查手机号格式是否正确");
-        }else if(this.valiateProvince() === false){
+        } else if (this.valiateProvince() === false) {
           this.$message.error("请检查地址格式是否正确");
-        }else{
+        } else {
           this.$message.error("请正确填写信息");
         }
       }
diff --git a/src/components/mycomponent/groupPage.vue b/src/components/mycomponent/groupPage.vue
index 666edc1..372e253 100644
--- a/src/components/mycomponent/groupPage.vue
+++ b/src/components/mycomponent/groupPage.vue
@@ -1,7 +1,7 @@
 <!--分页组件-->
 <template>
   <div class="footer">
-    <div>共{{ total }}页记录 第{{ offset }}/{{ total }}页</div>
+    <div>共{{ count }}条记录 第{{ offset }}/{{ total }}页</div>
     <div>
       <el-pagination
         ref="compontentPage"
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index 4398baa..241cdd4 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -5,22 +5,48 @@
       <div class="productInput">
         项目名称
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemName" placeholder="请输入项目名称" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemName"
+            placeholder="请输入项目名称"
+            clearable
+            class="product-input"
+          />
         </div>
         项目预算
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemBudget" placeholder="请输入项目预算" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemBudget"
+            placeholder="请输入项目预算"
+            clearable
+            class="product-input"
+          />
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
+          <el-date-picker
+            v-model="selectInfo.itemDuration"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择日期"
+            class="product-input"
+          />
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
       </div>
@@ -39,14 +65,31 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
       <el-table-column prop="itemBudget" label="项目预算" />
-      <el-table-column prop="itemDuration" label="预计工期" />
+      <el-table-column prop="itemDuration" label="预计工期" >
+        <template slot-scope="{row}">
+          <span>
+           {{row.itemDuration.split(' ')[0]}}
+          </span>
+        </template>
+    </el-table-column>
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
+      <el-table-column label="项目地址">
+        <template slot-scope="{row}">
+          <span>
+            {{row.itemProvince === row.itemCity ? row.itemCity + row.itemArea  + row.itemAddress : row.itemProvince + row.itemCity + row.itemArea  + row.itemAddress}}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="handlerDetail(scope.row)">
@@ -66,64 +109,96 @@
     />
     <!-- xiangqing弹框 -->
 
-    <businessDetailDialog v-if="dialogFormVisible" :data-info="dataInfo" @close="detailClose" />
+    <businessDetailDialog
+      v-if="dialogFormVisible"
+      :data-info="dataInfo"
+      @close="detailClose"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import businessDetailDialog from '../../components/mycomponent/dialog/business/businessDetailDialog.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import businessDetailDialog from "../../components/mycomponent/dialog/business/businessDetailDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/business/business'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import { listPage } from "../../api/business/business";
+export default {
+  // 加入分页逻辑
   components: {
     GroupPage,
-    businessDetailDialog
+    businessDetailDialog,
   },
   mixins: [listMixin],
   data() {
     return {
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
       dialogFormVisible: false,
-      dataInfo: {}
-    }
+      dataInfo: {},
+    };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     tableRowClassName: tableRowClassName,
     detailClose() {
-      this.dialogFormVisible = false
+      this.dialogFormVisible = false;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     handlerDetail(row) {
-      console.log(row)
-      this.dialogFormVisible = true
-      this.dataInfo = row
-    }
-  }
-
-}
+      console.log(row);
+      this.dialogFormVisible = true;
+      this.dataInfo = row;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -184,11 +259,9 @@
     color: #6666;
     margin: 30px 10px;
   }
-
 }
 
 .order-dialog {
-
   .dialog-tab {
     .dialog-title {
       font-size: 16px;
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 7045eaf..e1c37c7 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -1,21 +1,29 @@
 <!--商机报备表单-->
 <template>
   <div class="report-container">
-    <div class="report-title">
-      基础报备
-    </div>
+    <div class="report-title">基础报备</div>
     <div class="report-from">
-      <div class="from-title">
-        基础信息
-      </div>
+      <div class="from-title">基础信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemName" title="项目名称" placeholder="请输入项目名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemName"
+            title="项目名称"
+            placeholder="请输入项目名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemBudget" title="项目预算" placeholder="请输入项目预算" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemBudget"
+            title="项目预算"
+            placeholder="请输入项目预算"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -25,7 +33,7 @@
               value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
-              style="width:380px"
+              style="width: 380px"
             />
           </inputVue>
         </div>
@@ -43,7 +51,13 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.phone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.phone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -60,8 +74,18 @@
         <div class="input-item">
           <RedStar />
           <inputVue title="商机状态" class="inputWidth">
-            <el-select v-model="addInfo.status" clearable placeholder="请选择" style="width:380px">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select
+              v-model="addInfo.status"
+              clearable
+              placeholder="请选择"
+              style="width: 380px"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </inputVue>
         </div>
@@ -72,10 +96,15 @@
               v-model="addInfo.itemProvince"
               clearable
               placeholder="省/市"
-              style="width:150px;margin-left: 55px;"
+              style="width: 150px; margin-left: 55px"
               @change="provinceChange"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -83,29 +112,53 @@
               v-model="addInfo.itemCity"
               clearable
               placeholder="市/区"
-              style="width:150px"
+              style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.itemArea" clearable placeholder="县/街道" style="width:150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+            <el-select
+              v-model="addInfo.itemArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.itemAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.itemAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        关联方信息
-      </div>
+      <div class="from-title">关联方信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.ownerName" title="业主方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.ownerName"
+            title="业主方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -131,7 +184,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.contractName" title="总包方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.contractName"
+            title="总包方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -189,7 +248,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.agentName" title="代理商名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.agentName"
+            title="代理商名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -214,19 +279,29 @@
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        产品信息
-      </div>
+      <div class="from-title">产品信息</div>
       <div class="from-table">
-        <div style="margin-left: 2px;">
-          <el-table ref="tb" :data="addInfo.productList" border class="el-tab" style="width: 100%;">
+        <div style="margin-left: 2px">
+          <el-table
+            ref="tb"
+            :data="addInfo.productList"
+            border
+            class="el-tab"
+            style="width: 100%"
+          >
             <el-table-column type="index" label="序号" width="50px" />
+            
             <el-table-column prop="brandName" label="产品品牌" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.brandName }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.brandName" placeholder="请输入产品品牌">
                 </el-input> -->
-                <el-select v-if="showEdit[$index]" v-model="brandName" clearable placeholder="请输入产品品牌">
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="brandName"
+                  clearable
+                  placeholder="请输入产品品牌"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.brandCode"
@@ -237,7 +312,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="categoryIds" label="产品品类" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.categoryIds }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.categoryIds" placeholder="请输入产品品类">
                 </el-input> -->
@@ -257,8 +332,26 @@
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column prop="productName" label="产品名称" width="200px">
+              <template slot-scope="{ row, $index }">
+                <span v-if="!showEdit[$index]">{{ row.productName }}</span>
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productName"
+                  clearable
+                  placeholder="请输入产品型号"
+                >
+                  <el-option
+                    v-for="item in CodeList"
+                    :key="item.id + 1"
+                    :label="item.productName"
+                    :value="item.productName"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="productCode" label="产品型号" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productCode }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productCode" placeholder="请输入产品型号">
                 </el-input> -->
@@ -277,38 +370,63 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="productQuantity" label="产品数量" width="200px">
-              <template slot-scope="{row,$index}">
+            <el-table-column
+              prop="productQuantity"
+              label="产品数量"
+              width="200px"
+            >
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productQuantity }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productQuantity" placeholder="请输入产品数量" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productQuantity"
+                  placeholder="请输入产品数量"
+                />
               </template>
             </el-table-column>
             <el-table-column prop="productPrice" label="产品单价" width="200px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productPrice }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productPrice" placeholder="请输入产品单价" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productPrice"
+                  placeholder="请输入产品单价"
+                />
               </template>
             </el-table-column>
-            <el-table-column header-align="center" align="center" width="200" label="操作">
-              <template slot-scope="{row,$index}">
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showUpdate($index, row)">
+            <el-table-column
+              header-align="center"
+              align="center"
+              width="200"
+              label="操作"
+            >
+              <template slot-scope="{ row, $index }">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showUpdate($index, row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showDelete($index, row)">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showDelete($index, row)"
+                >
                   删除
                 </el-button>
                 <el-button
                   v-if="showEdit[$index]"
                   size="small"
-                  style="color: #85ce61;"
+                  style="color: #85ce61"
                   @click="submit($index, row)"
                 >
                   确定
                 </el-button>
                 <el-button
-                  v-if="showEdit[$index] && isFirst[$index] >1"
+                  v-if="showEdit[$index] && isFirst[$index] > 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="cancelUpdate($index)"
                 >
                   取消
@@ -316,7 +434,7 @@
                 <el-button
                   v-if="showEdit[$index] && isFirst[$index] === 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="showDelete($index)"
                 >
                   删除
@@ -327,300 +445,323 @@
         </div>
       </div>
       <div>
-          <el-button class="table-btn" @click="handleAddBtn">
-            添加项目需求
-          </el-button>
-        </div>
+        <el-button class="table-btn" @click="handleAddBtn">
+          添加项目需求
+        </el-button>
+      </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+      <el-button type="info" class="close" @click="close"> 取消 </el-button>
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { list } from '../../api/product/product'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { add } from '../../api/business/business'
-import { order_area } from '../../api/order/order'
-import { Message } from 'element-ui'
+import { list } from "../../api/product/product";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { add } from "../../api/business/business";
+import { order_area } from "../../api/order/order";
+import { Message } from "element-ui";
 export default {
   components: {
-    RedStar, inputVue
+    RedStar,
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
+      brandName: "",
+      categoryIds: "",
       CodeList: [],
       brandList: [],
       categoryList: [],
       checkedDetail: [],
       showEdit: [], // 用来判断是否处于编辑状态
-      isFirst:[], // 用来判断是否初次添加
+      isFirst: [], // 用来判断是否初次添加
       options: [
-        { value: '0', label: '推进' },
-        { value: '1', label: '成交' },
-        { value: '2', label: '丢失' }
+        { value: "0", label: "推进" },
+        { value: "1", label: "成交" },
+        { value: "2", label: "丢失" },
       ],
       addInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
-      }
-    }
+        countyList: [],
+      },
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
+        console.log(newval, oldval);
         if (!this.addInfo.itemProvince) {
-          this.addInfo.itemCity = ''
-          this.addInfo.itemArea = ''
+          this.addInfo.itemCity = "";
+          this.addInfo.itemArea = "";
         } else if (!this.addInfo.itemCity) {
-          this.addInfo.itemArea = ''
+          this.addInfo.itemArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
   },
-  mounted() {
-
-  },
+  mounted() {},
   methods: {
     save() {
-      if(this.valiateForm()){
-        this.addInfo.productList = {
-        productCode: this.addInfo.productList.productCode,
-        productQuantity: this.addInfo.productList.productQuantity,
-        productPrice: this.addInfo.productList.productPrice,
-        productName: ''
-      }
-      add(this.addInfo).then(res => {
-        this.setData()
+      if (this.valiateForm()) {
+        //   this.addInfo.productList = {
+        //   productCode: this.addInfo.productList.productCode,
+        //   productQuantity: this.addInfo.productList.productQuantity,
+        //   productPrice: this.addInfo.productList.productPrice,
+        //   productName: ''
+        // }
+        if(this.addInfo.productList.length && this.showEdit.every(item => item=== false)){
+          add(this.addInfo).then((res) => {
+          this.setData();
           this.$message({
-            message: '保存成功',
-            type: 'success'
-          })
-      }) 
+            message: "保存成功",
+            type: "success",
+          });
+        });
+        }else{
+          this.$message.error('请先添加或保存产品信息')
+        }
       } else {
         this.$message({
-            message: '请先完整填写报备信息',
-            type: 'error'
-          })
+          message: "请先完整填写报备信息",
+          type: "error",
+        });
       }
-      
     },
     close() {
-      this.setData()
+      this.setData();
     },
     provinceChange(e) {
-      console.log(e)
-      const index = this.form.provinceList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.provinceList[index].id
+      console.log(e);
+      const index = this.form.provinceList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.provinceList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(e) {
-      const index = this.form.cityList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.cityList[index].id
+      const index = this.form.cityList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.cityList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     handleAddBtn() {
-      const obj = {}
-      obj.brandName = ''
-      obj.categoryIds = ''
-      obj.productCode = ''
-      obj.productQuantity = ''
-      obj.productPrice = ''
-      this.addInfo.productList.push(obj)
-      this.showEdit[this.addInfo.productList.length-1] = true
-      this.isFirst[this.addInfo.productList.length - 1] = 1
-      C_list().then(res => {
-        console.log(res, '品类')
-        this.categoryList = res.data
-      })
-      SelectList().then(res => {
-        console.log(res, '品牌')
-        this.brandList = res
-      })
+      if (
+        this.showEdit[this.addInfo.productList.length - 1] === false ||
+        this.addInfo.productList.length === 0
+      ) {
+        const obj = {};
+        obj.brandName = "";
+        obj.categoryIds = "";
+        obj.productCode = "";
+        obj.productQuantity = "";
+        obj.productPrice = "";
+        obj.productName = "";
+        this.addInfo.productList.push(obj);
+        this.showEdit[this.addInfo.productList.length - 1] = true;
+        this.isFirst[this.addInfo.productList.length - 1] = 1;
+        C_list().then((res) => {
+          this.categoryList = res.data;
+        });
+        SelectList().then((res) => {
+          this.brandList = res;
+        });
+      } else {
+        this.$message.warning("请先保存上一次");
+      }
     },
     showUpdate(index, row) {
-      this.showEdit[index] = true
-      this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
-      this.brandName = row.brandName
-      this.categoryIds = row.categoryIds
-      this.addInfo.productList.productCode = row.productCode
-      this.addInfo.productList.productQuantity = row.productQuantity
-      this.addInfo.productList.productPrice = row.productPrice
+      this.showEdit[index] = true;
+      this.$set(this.showEdit, index, true); // 这里要用$set方法，否则页面状态不更新
+      this.brandName = row.brandName;
+      this.categoryIds = row.categoryIds;
+      this.addInfo.productList.productCode = row.productCode;
+      this.addInfo.productList.productQuantity = row.productQuantity;
+      this.addInfo.productList.productPrice = row.productPrice;
+      this.addInfo.productList.productName = row.productName;
     },
-    showDelete(index, row){
-      this.$confirm('确认删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    showDelete(index, row) {
+      this.$confirm("确认删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.addInfo.productList = this.addInfo.productList.filter((item,Index) => index!==Index)
-          this.showEdit = this.showEdit.filter((item,Index) => index!==Index)
-          this.isFirst = this.isFirst.filter((item,Index) => index!==Index)
+          this.addInfo.productList = this.addInfo.productList.filter(
+            (item, Index) => index !== Index
+          );
+          this.showEdit = this.showEdit.filter(
+            (item, Index) => index !== Index
+          );
+          this.isFirst = this.isFirst.filter((item, Index) => index !== Index);
           this.$message({
-            message: '已删除',
-            type: 'success'
-          })
+            message: "已删除",
+            type: "success",
+          });
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
+      const index = this.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      const code = this.categoryList[index].id;
+      console.log(code);
+      list({ categoryId: code }).then((res) => {
+        console.log(res);
+        this.CodeList = res;
+        // this.addInfo.productList.productName =''
+        // this.addInfo.productList.productCode =''
+      });
     },
     cancelUpdate(index) {
-      this.$confirm('取消修改？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("取消修改？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.$set(this.showEdit, index, false)
+          this.$set(this.showEdit, index, false);
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     submit(index, row) {
       // 发送请求，隐藏输入框
-      const { productCode, brandName, categoryIds, addInfo: { productList: { productQuantity, productPrice } } } = this
-      if (categoryIds&& brandName  && productQuantity && productPrice) {
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
+      const {
+        brandName,
+        categoryIds,
+        addInfo: {
+          productList: { productQuantity, productPrice },
+        },
+      } = this;
+      if (categoryIds && brandName) {
+        if (productQuantity > 0 && productPrice > 0) {
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$message({
+            type: "success",
+            message: "已缓存，记得点击保存提交修改喔！",
+            duration: 888,
+            onClose: () => {
+              this.$set(this.showEdit, index, false); // vue添加属性的方法
+            },
+          });
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$set(this.isFirst, index, 2);
+          this.brandName = "";
+          this.categoryIds = "";
+          this.addInfo.productList.productCode = "";
+          this.addInfo.productList.productQuantity = "";
+          this.addInfo.productList.productPrice = "";
+          this.addInfo.productList.productName = "";
+        } else {
+          this.$message.error("单价或数量需大于等于1");
+        }
+      } else {
         this.$message({
-          type: 'success',
-          message: '已缓存，记得点击保存提交修改喔！',
-          duration: 888,
-          onClose: () => {
-            this.$set(this.showEdit, index, false) // vue添加属性的方法
-          }
-        })
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
-        this.$set(this.isFirst, index, 2)
-        this.brandName = ''
-        this.categoryIds = ''
-        this.addInfo.productList.productCode = ''
-        this.addInfo.productList.productQuantity = ''
-        this.addInfo.productList.productPrice = ''
-      } else{
-        this.$message({
-              message: "请先完整选择或填写信息",
-              type: "error",
-            });
+          message: "请先完整选择或填写信息",
+          type: "error",
+        });
       }
     },
     setData() {
       this.addInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
+      };
     },
     valiateForm() {
-      let arr = []
-      for(var item in this.addInfo) {
-        if(this.addInfo[item]){
-          arr.push(1)
-        }else{
-          arr.push(0)
+      let arr = [];
+      for (var item in this.addInfo) {
+        if (this.addInfo[item]) {
+          arr.push(1);
+        } else {
+          arr.push(0);
         }
       }
-      return arr.every(item => item === 1)
-    }
-  }
-}
+      return arr.every((item) => item === 1);
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -673,7 +814,6 @@
     .close {
       width: 100px;
     }
-
   }
 }
 </style>
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 6638e3b..c899612 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -30,7 +30,12 @@
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
     >
-      <el-table-column prop="index" width="100px" label="序号" />
+      <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="distributorCode" width="200px" label="经销商编号" />
       <el-table-column prop="distributorName" width="400px" label="经销商名称" />
       <el-table-column prop="companyNatureName" width="150px" label="单位性质" />
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index de08ec0..704a758 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -92,7 +92,12 @@
       style="width: 100%"
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="account" label="账号" />
       <el-table-column prop="province" label="省" />
       <el-table-column prop="city" label="市" />
@@ -176,9 +181,19 @@
     },
     reset() {
       this.selectInfo = {
-        recommendType: '',
-        recommendTitle: ''
+        account: '',
+        province: '',
+        city: '',
+        area: ''
       }
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((offset - 1) * 10)
+        })
+        this.tableData = res
+      })
+
     },
     Bdelete(row) {
       // console.log(row);
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index ae070d5..5cc02cf 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -55,6 +55,11 @@
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
       <el-table-column prop="date" label="序号" />
+      <!-- <el-table-column type="index" label="序号" > -->
+      <!-- <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column> -->
       <el-table-column prop="name" label="账号" />
       <el-table-column prop="address" label="用户名" />
       <el-table-column prop="address1" label="姓名" />
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index cc4041f..94f52ad 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -76,6 +76,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
+          @click="batchDelete"
         >
           删除
         </el-button>
@@ -91,9 +92,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      ref="multipleTable"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="messageCode" label="消息编号" />
       <el-table-column prop="messageTitle" label="消息标题" />
       <el-table-column prop="messageContent" label="消息内容" />
@@ -106,6 +113,7 @@
           <el-button
             type="text"
             size="small"
+            @click="remove(scope.row)"
           >
             删除
           </el-button>
@@ -127,7 +135,7 @@
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/move/message'
+import { listPage ,deleteBatch ,deleteInfo} from '../../api/move/message'
 export default { // 加入分页逻辑
   components: {
     MassageAddDialog,
@@ -184,6 +192,44 @@
       this.isShowAdd = true
       this.title = '消息推送编辑'
       this.$refs.addMessage.init(row)
+    },
+    // 批量删除
+    batchDelete(){
+      if(this.$refs.multipleTable.selection.length){
+        this.$confirm(`确认删除选中的这些数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+         //  得到选中行
+         const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            deleteBatch({ ids: ids }).then((res) => {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+              });
+              this.refresh();
+            });
+      }).catch(()=>{})
+      }else{
+        this.$message.error('请先选择需要删除的消息记录')
+      }
+    },
+    remove(row){
+      this.$confirm(`确认删除此项数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+        deleteInfo({id:row.id}).then(()=>{
+          this.$message.success('操作成功')
+          this.refresh();
+        })
+      }).catch(()=>{})
     }
   }
 }
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 0f26885..1c67bdb 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -35,7 +35,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="id" label="序号" />
+      <el-table-column type="index" label="序号" />
       <el-table-column prop="orderId" label="订单号" />
       <el-table-column prop="userName" label="下单人" />
       <el-table-column prop="userPhone" label="联系方式" />

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 4cae18a..25f5978 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -182,15 +182,16 @@
         temp.deliveryArea = this.AreaList[aindex].areaName;
         turnOrder(temp).then((res) => {
           this.$message.success("添加成功");
-          this.close();
+          this.$emit("close");
+          this.reset();
         });
-      }else {
-        console.log(this.valiatePhone())
-        if(this.valiatePhone() === false){
+      } else {
+        console.log(this.valiatePhone());
+        if (this.valiatePhone() === false) {
           this.$message.error("请检查手机号格式是否正确");
-        }else if(this.valiateProvince() === false){
+        } else if (this.valiateProvince() === false) {
           this.$message.error("请检查地址格式是否正确");
-        }else{
+        } else {
           this.$message.error("请正确填写信息");
         }
       }
diff --git a/src/components/mycomponent/groupPage.vue b/src/components/mycomponent/groupPage.vue
index 666edc1..372e253 100644
--- a/src/components/mycomponent/groupPage.vue
+++ b/src/components/mycomponent/groupPage.vue
@@ -1,7 +1,7 @@
 <!--分页组件-->
 <template>
   <div class="footer">
-    <div>共{{ total }}页记录 第{{ offset }}/{{ total }}页</div>
+    <div>共{{ count }}条记录 第{{ offset }}/{{ total }}页</div>
     <div>
       <el-pagination
         ref="compontentPage"
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index 4398baa..241cdd4 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -5,22 +5,48 @@
       <div class="productInput">
         项目名称
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemName" placeholder="请输入项目名称" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemName"
+            placeholder="请输入项目名称"
+            clearable
+            class="product-input"
+          />
         </div>
         项目预算
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemBudget" placeholder="请输入项目预算" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemBudget"
+            placeholder="请输入项目预算"
+            clearable
+            class="product-input"
+          />
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
+          <el-date-picker
+            v-model="selectInfo.itemDuration"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择日期"
+            class="product-input"
+          />
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
       </div>
@@ -39,14 +65,31 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
       <el-table-column prop="itemBudget" label="项目预算" />
-      <el-table-column prop="itemDuration" label="预计工期" />
+      <el-table-column prop="itemDuration" label="预计工期" >
+        <template slot-scope="{row}">
+          <span>
+           {{row.itemDuration.split(' ')[0]}}
+          </span>
+        </template>
+    </el-table-column>
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
+      <el-table-column label="项目地址">
+        <template slot-scope="{row}">
+          <span>
+            {{row.itemProvince === row.itemCity ? row.itemCity + row.itemArea  + row.itemAddress : row.itemProvince + row.itemCity + row.itemArea  + row.itemAddress}}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="handlerDetail(scope.row)">
@@ -66,64 +109,96 @@
     />
     <!-- xiangqing弹框 -->
 
-    <businessDetailDialog v-if="dialogFormVisible" :data-info="dataInfo" @close="detailClose" />
+    <businessDetailDialog
+      v-if="dialogFormVisible"
+      :data-info="dataInfo"
+      @close="detailClose"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import businessDetailDialog from '../../components/mycomponent/dialog/business/businessDetailDialog.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import businessDetailDialog from "../../components/mycomponent/dialog/business/businessDetailDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/business/business'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import { listPage } from "../../api/business/business";
+export default {
+  // 加入分页逻辑
   components: {
     GroupPage,
-    businessDetailDialog
+    businessDetailDialog,
   },
   mixins: [listMixin],
   data() {
     return {
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
       dialogFormVisible: false,
-      dataInfo: {}
-    }
+      dataInfo: {},
+    };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     tableRowClassName: tableRowClassName,
     detailClose() {
-      this.dialogFormVisible = false
+      this.dialogFormVisible = false;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     handlerDetail(row) {
-      console.log(row)
-      this.dialogFormVisible = true
-      this.dataInfo = row
-    }
-  }
-
-}
+      console.log(row);
+      this.dialogFormVisible = true;
+      this.dataInfo = row;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -184,11 +259,9 @@
     color: #6666;
     margin: 30px 10px;
   }
-
 }
 
 .order-dialog {
-
   .dialog-tab {
     .dialog-title {
       font-size: 16px;
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 7045eaf..e1c37c7 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -1,21 +1,29 @@
 <!--商机报备表单-->
 <template>
   <div class="report-container">
-    <div class="report-title">
-      基础报备
-    </div>
+    <div class="report-title">基础报备</div>
     <div class="report-from">
-      <div class="from-title">
-        基础信息
-      </div>
+      <div class="from-title">基础信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemName" title="项目名称" placeholder="请输入项目名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemName"
+            title="项目名称"
+            placeholder="请输入项目名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemBudget" title="项目预算" placeholder="请输入项目预算" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemBudget"
+            title="项目预算"
+            placeholder="请输入项目预算"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -25,7 +33,7 @@
               value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
-              style="width:380px"
+              style="width: 380px"
             />
           </inputVue>
         </div>
@@ -43,7 +51,13 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.phone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.phone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -60,8 +74,18 @@
         <div class="input-item">
           <RedStar />
           <inputVue title="商机状态" class="inputWidth">
-            <el-select v-model="addInfo.status" clearable placeholder="请选择" style="width:380px">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select
+              v-model="addInfo.status"
+              clearable
+              placeholder="请选择"
+              style="width: 380px"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </inputVue>
         </div>
@@ -72,10 +96,15 @@
               v-model="addInfo.itemProvince"
               clearable
               placeholder="省/市"
-              style="width:150px;margin-left: 55px;"
+              style="width: 150px; margin-left: 55px"
               @change="provinceChange"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -83,29 +112,53 @@
               v-model="addInfo.itemCity"
               clearable
               placeholder="市/区"
-              style="width:150px"
+              style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.itemArea" clearable placeholder="县/街道" style="width:150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+            <el-select
+              v-model="addInfo.itemArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.itemAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.itemAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        关联方信息
-      </div>
+      <div class="from-title">关联方信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.ownerName" title="业主方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.ownerName"
+            title="业主方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -131,7 +184,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.contractName" title="总包方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.contractName"
+            title="总包方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -189,7 +248,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.agentName" title="代理商名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.agentName"
+            title="代理商名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -214,19 +279,29 @@
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        产品信息
-      </div>
+      <div class="from-title">产品信息</div>
       <div class="from-table">
-        <div style="margin-left: 2px;">
-          <el-table ref="tb" :data="addInfo.productList" border class="el-tab" style="width: 100%;">
+        <div style="margin-left: 2px">
+          <el-table
+            ref="tb"
+            :data="addInfo.productList"
+            border
+            class="el-tab"
+            style="width: 100%"
+          >
             <el-table-column type="index" label="序号" width="50px" />
+            
             <el-table-column prop="brandName" label="产品品牌" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.brandName }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.brandName" placeholder="请输入产品品牌">
                 </el-input> -->
-                <el-select v-if="showEdit[$index]" v-model="brandName" clearable placeholder="请输入产品品牌">
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="brandName"
+                  clearable
+                  placeholder="请输入产品品牌"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.brandCode"
@@ -237,7 +312,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="categoryIds" label="产品品类" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.categoryIds }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.categoryIds" placeholder="请输入产品品类">
                 </el-input> -->
@@ -257,8 +332,26 @@
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column prop="productName" label="产品名称" width="200px">
+              <template slot-scope="{ row, $index }">
+                <span v-if="!showEdit[$index]">{{ row.productName }}</span>
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productName"
+                  clearable
+                  placeholder="请输入产品型号"
+                >
+                  <el-option
+                    v-for="item in CodeList"
+                    :key="item.id + 1"
+                    :label="item.productName"
+                    :value="item.productName"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="productCode" label="产品型号" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productCode }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productCode" placeholder="请输入产品型号">
                 </el-input> -->
@@ -277,38 +370,63 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="productQuantity" label="产品数量" width="200px">
-              <template slot-scope="{row,$index}">
+            <el-table-column
+              prop="productQuantity"
+              label="产品数量"
+              width="200px"
+            >
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productQuantity }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productQuantity" placeholder="请输入产品数量" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productQuantity"
+                  placeholder="请输入产品数量"
+                />
               </template>
             </el-table-column>
             <el-table-column prop="productPrice" label="产品单价" width="200px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productPrice }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productPrice" placeholder="请输入产品单价" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productPrice"
+                  placeholder="请输入产品单价"
+                />
               </template>
             </el-table-column>
-            <el-table-column header-align="center" align="center" width="200" label="操作">
-              <template slot-scope="{row,$index}">
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showUpdate($index, row)">
+            <el-table-column
+              header-align="center"
+              align="center"
+              width="200"
+              label="操作"
+            >
+              <template slot-scope="{ row, $index }">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showUpdate($index, row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showDelete($index, row)">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showDelete($index, row)"
+                >
                   删除
                 </el-button>
                 <el-button
                   v-if="showEdit[$index]"
                   size="small"
-                  style="color: #85ce61;"
+                  style="color: #85ce61"
                   @click="submit($index, row)"
                 >
                   确定
                 </el-button>
                 <el-button
-                  v-if="showEdit[$index] && isFirst[$index] >1"
+                  v-if="showEdit[$index] && isFirst[$index] > 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="cancelUpdate($index)"
                 >
                   取消
@@ -316,7 +434,7 @@
                 <el-button
                   v-if="showEdit[$index] && isFirst[$index] === 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="showDelete($index)"
                 >
                   删除
@@ -327,300 +445,323 @@
         </div>
       </div>
       <div>
-          <el-button class="table-btn" @click="handleAddBtn">
-            添加项目需求
-          </el-button>
-        </div>
+        <el-button class="table-btn" @click="handleAddBtn">
+          添加项目需求
+        </el-button>
+      </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+      <el-button type="info" class="close" @click="close"> 取消 </el-button>
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { list } from '../../api/product/product'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { add } from '../../api/business/business'
-import { order_area } from '../../api/order/order'
-import { Message } from 'element-ui'
+import { list } from "../../api/product/product";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { add } from "../../api/business/business";
+import { order_area } from "../../api/order/order";
+import { Message } from "element-ui";
 export default {
   components: {
-    RedStar, inputVue
+    RedStar,
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
+      brandName: "",
+      categoryIds: "",
       CodeList: [],
       brandList: [],
       categoryList: [],
       checkedDetail: [],
       showEdit: [], // 用来判断是否处于编辑状态
-      isFirst:[], // 用来判断是否初次添加
+      isFirst: [], // 用来判断是否初次添加
       options: [
-        { value: '0', label: '推进' },
-        { value: '1', label: '成交' },
-        { value: '2', label: '丢失' }
+        { value: "0", label: "推进" },
+        { value: "1", label: "成交" },
+        { value: "2", label: "丢失" },
       ],
       addInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
-      }
-    }
+        countyList: [],
+      },
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
+        console.log(newval, oldval);
         if (!this.addInfo.itemProvince) {
-          this.addInfo.itemCity = ''
-          this.addInfo.itemArea = ''
+          this.addInfo.itemCity = "";
+          this.addInfo.itemArea = "";
         } else if (!this.addInfo.itemCity) {
-          this.addInfo.itemArea = ''
+          this.addInfo.itemArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
   },
-  mounted() {
-
-  },
+  mounted() {},
   methods: {
     save() {
-      if(this.valiateForm()){
-        this.addInfo.productList = {
-        productCode: this.addInfo.productList.productCode,
-        productQuantity: this.addInfo.productList.productQuantity,
-        productPrice: this.addInfo.productList.productPrice,
-        productName: ''
-      }
-      add(this.addInfo).then(res => {
-        this.setData()
+      if (this.valiateForm()) {
+        //   this.addInfo.productList = {
+        //   productCode: this.addInfo.productList.productCode,
+        //   productQuantity: this.addInfo.productList.productQuantity,
+        //   productPrice: this.addInfo.productList.productPrice,
+        //   productName: ''
+        // }
+        if(this.addInfo.productList.length && this.showEdit.every(item => item=== false)){
+          add(this.addInfo).then((res) => {
+          this.setData();
           this.$message({
-            message: '保存成功',
-            type: 'success'
-          })
-      }) 
+            message: "保存成功",
+            type: "success",
+          });
+        });
+        }else{
+          this.$message.error('请先添加或保存产品信息')
+        }
       } else {
         this.$message({
-            message: '请先完整填写报备信息',
-            type: 'error'
-          })
+          message: "请先完整填写报备信息",
+          type: "error",
+        });
       }
-      
     },
     close() {
-      this.setData()
+      this.setData();
     },
     provinceChange(e) {
-      console.log(e)
-      const index = this.form.provinceList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.provinceList[index].id
+      console.log(e);
+      const index = this.form.provinceList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.provinceList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(e) {
-      const index = this.form.cityList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.cityList[index].id
+      const index = this.form.cityList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.cityList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     handleAddBtn() {
-      const obj = {}
-      obj.brandName = ''
-      obj.categoryIds = ''
-      obj.productCode = ''
-      obj.productQuantity = ''
-      obj.productPrice = ''
-      this.addInfo.productList.push(obj)
-      this.showEdit[this.addInfo.productList.length-1] = true
-      this.isFirst[this.addInfo.productList.length - 1] = 1
-      C_list().then(res => {
-        console.log(res, '品类')
-        this.categoryList = res.data
-      })
-      SelectList().then(res => {
-        console.log(res, '品牌')
-        this.brandList = res
-      })
+      if (
+        this.showEdit[this.addInfo.productList.length - 1] === false ||
+        this.addInfo.productList.length === 0
+      ) {
+        const obj = {};
+        obj.brandName = "";
+        obj.categoryIds = "";
+        obj.productCode = "";
+        obj.productQuantity = "";
+        obj.productPrice = "";
+        obj.productName = "";
+        this.addInfo.productList.push(obj);
+        this.showEdit[this.addInfo.productList.length - 1] = true;
+        this.isFirst[this.addInfo.productList.length - 1] = 1;
+        C_list().then((res) => {
+          this.categoryList = res.data;
+        });
+        SelectList().then((res) => {
+          this.brandList = res;
+        });
+      } else {
+        this.$message.warning("请先保存上一次");
+      }
     },
     showUpdate(index, row) {
-      this.showEdit[index] = true
-      this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
-      this.brandName = row.brandName
-      this.categoryIds = row.categoryIds
-      this.addInfo.productList.productCode = row.productCode
-      this.addInfo.productList.productQuantity = row.productQuantity
-      this.addInfo.productList.productPrice = row.productPrice
+      this.showEdit[index] = true;
+      this.$set(this.showEdit, index, true); // 这里要用$set方法，否则页面状态不更新
+      this.brandName = row.brandName;
+      this.categoryIds = row.categoryIds;
+      this.addInfo.productList.productCode = row.productCode;
+      this.addInfo.productList.productQuantity = row.productQuantity;
+      this.addInfo.productList.productPrice = row.productPrice;
+      this.addInfo.productList.productName = row.productName;
     },
-    showDelete(index, row){
-      this.$confirm('确认删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    showDelete(index, row) {
+      this.$confirm("确认删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.addInfo.productList = this.addInfo.productList.filter((item,Index) => index!==Index)
-          this.showEdit = this.showEdit.filter((item,Index) => index!==Index)
-          this.isFirst = this.isFirst.filter((item,Index) => index!==Index)
+          this.addInfo.productList = this.addInfo.productList.filter(
+            (item, Index) => index !== Index
+          );
+          this.showEdit = this.showEdit.filter(
+            (item, Index) => index !== Index
+          );
+          this.isFirst = this.isFirst.filter((item, Index) => index !== Index);
           this.$message({
-            message: '已删除',
-            type: 'success'
-          })
+            message: "已删除",
+            type: "success",
+          });
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
+      const index = this.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      const code = this.categoryList[index].id;
+      console.log(code);
+      list({ categoryId: code }).then((res) => {
+        console.log(res);
+        this.CodeList = res;
+        // this.addInfo.productList.productName =''
+        // this.addInfo.productList.productCode =''
+      });
     },
     cancelUpdate(index) {
-      this.$confirm('取消修改？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("取消修改？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.$set(this.showEdit, index, false)
+          this.$set(this.showEdit, index, false);
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     submit(index, row) {
       // 发送请求，隐藏输入框
-      const { productCode, brandName, categoryIds, addInfo: { productList: { productQuantity, productPrice } } } = this
-      if (categoryIds&& brandName  && productQuantity && productPrice) {
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
+      const {
+        brandName,
+        categoryIds,
+        addInfo: {
+          productList: { productQuantity, productPrice },
+        },
+      } = this;
+      if (categoryIds && brandName) {
+        if (productQuantity > 0 && productPrice > 0) {
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$message({
+            type: "success",
+            message: "已缓存，记得点击保存提交修改喔！",
+            duration: 888,
+            onClose: () => {
+              this.$set(this.showEdit, index, false); // vue添加属性的方法
+            },
+          });
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$set(this.isFirst, index, 2);
+          this.brandName = "";
+          this.categoryIds = "";
+          this.addInfo.productList.productCode = "";
+          this.addInfo.productList.productQuantity = "";
+          this.addInfo.productList.productPrice = "";
+          this.addInfo.productList.productName = "";
+        } else {
+          this.$message.error("单价或数量需大于等于1");
+        }
+      } else {
         this.$message({
-          type: 'success',
-          message: '已缓存，记得点击保存提交修改喔！',
-          duration: 888,
-          onClose: () => {
-            this.$set(this.showEdit, index, false) // vue添加属性的方法
-          }
-        })
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
-        this.$set(this.isFirst, index, 2)
-        this.brandName = ''
-        this.categoryIds = ''
-        this.addInfo.productList.productCode = ''
-        this.addInfo.productList.productQuantity = ''
-        this.addInfo.productList.productPrice = ''
-      } else{
-        this.$message({
-              message: "请先完整选择或填写信息",
-              type: "error",
-            });
+          message: "请先完整选择或填写信息",
+          type: "error",
+        });
       }
     },
     setData() {
       this.addInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
+      };
     },
     valiateForm() {
-      let arr = []
-      for(var item in this.addInfo) {
-        if(this.addInfo[item]){
-          arr.push(1)
-        }else{
-          arr.push(0)
+      let arr = [];
+      for (var item in this.addInfo) {
+        if (this.addInfo[item]) {
+          arr.push(1);
+        } else {
+          arr.push(0);
         }
       }
-      return arr.every(item => item === 1)
-    }
-  }
-}
+      return arr.every((item) => item === 1);
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -673,7 +814,6 @@
     .close {
       width: 100px;
     }
-
   }
 }
 </style>
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 6638e3b..c899612 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -30,7 +30,12 @@
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
     >
-      <el-table-column prop="index" width="100px" label="序号" />
+      <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="distributorCode" width="200px" label="经销商编号" />
       <el-table-column prop="distributorName" width="400px" label="经销商名称" />
       <el-table-column prop="companyNatureName" width="150px" label="单位性质" />
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index de08ec0..704a758 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -92,7 +92,12 @@
       style="width: 100%"
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="account" label="账号" />
       <el-table-column prop="province" label="省" />
       <el-table-column prop="city" label="市" />
@@ -176,9 +181,19 @@
     },
     reset() {
       this.selectInfo = {
-        recommendType: '',
-        recommendTitle: ''
+        account: '',
+        province: '',
+        city: '',
+        area: ''
       }
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((offset - 1) * 10)
+        })
+        this.tableData = res
+      })
+
     },
     Bdelete(row) {
       // console.log(row);
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index ae070d5..5cc02cf 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -55,6 +55,11 @@
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
       <el-table-column prop="date" label="序号" />
+      <!-- <el-table-column type="index" label="序号" > -->
+      <!-- <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column> -->
       <el-table-column prop="name" label="账号" />
       <el-table-column prop="address" label="用户名" />
       <el-table-column prop="address1" label="姓名" />
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index cc4041f..94f52ad 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -76,6 +76,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
+          @click="batchDelete"
         >
           删除
         </el-button>
@@ -91,9 +92,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      ref="multipleTable"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="messageCode" label="消息编号" />
       <el-table-column prop="messageTitle" label="消息标题" />
       <el-table-column prop="messageContent" label="消息内容" />
@@ -106,6 +113,7 @@
           <el-button
             type="text"
             size="small"
+            @click="remove(scope.row)"
           >
             删除
           </el-button>
@@ -127,7 +135,7 @@
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/move/message'
+import { listPage ,deleteBatch ,deleteInfo} from '../../api/move/message'
 export default { // 加入分页逻辑
   components: {
     MassageAddDialog,
@@ -184,6 +192,44 @@
       this.isShowAdd = true
       this.title = '消息推送编辑'
       this.$refs.addMessage.init(row)
+    },
+    // 批量删除
+    batchDelete(){
+      if(this.$refs.multipleTable.selection.length){
+        this.$confirm(`确认删除选中的这些数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+         //  得到选中行
+         const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            deleteBatch({ ids: ids }).then((res) => {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+              });
+              this.refresh();
+            });
+      }).catch(()=>{})
+      }else{
+        this.$message.error('请先选择需要删除的消息记录')
+      }
+    },
+    remove(row){
+      this.$confirm(`确认删除此项数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+        deleteInfo({id:row.id}).then(()=>{
+          this.$message.success('操作成功')
+          this.refresh();
+        })
+      }).catch(()=>{})
     }
   }
 }
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 0f26885..1c67bdb 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -35,7 +35,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="id" label="序号" />
+      <el-table-column type="index" label="序号" />
       <el-table-column prop="orderId" label="订单号" />
       <el-table-column prop="userName" label="下单人" />
       <el-table-column prop="userPhone" label="联系方式" />
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index ab6f457..514371a 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -403,11 +403,11 @@
     },
     valiateProduct() {
       // 验证产品列表
-      if (this.addInfo.productList.length) {
+      if (this.addInfo.productList.length && this.showEdit.every(item => item=== false)) {
         return true;
       } else {
         this.$message({
-          message: "产品列表不能为空",
+          message: "请先添加或保存产品信息",
           type: "error",
         });
         return false;
@@ -478,6 +478,7 @@
           }
         })
         row.productCode = this.addInfo.productList.productCode
+        
         row.brandName = this.brandName
         row.categoryIds = this.categoryIds
         row.productQuantity = this.addInfo.productList.productQuantity

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 4cae18a..25f5978 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -182,15 +182,16 @@
         temp.deliveryArea = this.AreaList[aindex].areaName;
         turnOrder(temp).then((res) => {
           this.$message.success("添加成功");
-          this.close();
+          this.$emit("close");
+          this.reset();
         });
-      }else {
-        console.log(this.valiatePhone())
-        if(this.valiatePhone() === false){
+      } else {
+        console.log(this.valiatePhone());
+        if (this.valiatePhone() === false) {
           this.$message.error("请检查手机号格式是否正确");
-        }else if(this.valiateProvince() === false){
+        } else if (this.valiateProvince() === false) {
           this.$message.error("请检查地址格式是否正确");
-        }else{
+        } else {
           this.$message.error("请正确填写信息");
         }
       }
diff --git a/src/components/mycomponent/groupPage.vue b/src/components/mycomponent/groupPage.vue
index 666edc1..372e253 100644
--- a/src/components/mycomponent/groupPage.vue
+++ b/src/components/mycomponent/groupPage.vue
@@ -1,7 +1,7 @@
 <!--分页组件-->
 <template>
   <div class="footer">
-    <div>共{{ total }}页记录 第{{ offset }}/{{ total }}页</div>
+    <div>共{{ count }}条记录 第{{ offset }}/{{ total }}页</div>
     <div>
       <el-pagination
         ref="compontentPage"
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index 4398baa..241cdd4 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -5,22 +5,48 @@
       <div class="productInput">
         项目名称
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemName" placeholder="请输入项目名称" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemName"
+            placeholder="请输入项目名称"
+            clearable
+            class="product-input"
+          />
         </div>
         项目预算
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemBudget" placeholder="请输入项目预算" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemBudget"
+            placeholder="请输入项目预算"
+            clearable
+            class="product-input"
+          />
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
+          <el-date-picker
+            v-model="selectInfo.itemDuration"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择日期"
+            class="product-input"
+          />
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
       </div>
@@ -39,14 +65,31 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
       <el-table-column prop="itemBudget" label="项目预算" />
-      <el-table-column prop="itemDuration" label="预计工期" />
+      <el-table-column prop="itemDuration" label="预计工期" >
+        <template slot-scope="{row}">
+          <span>
+           {{row.itemDuration.split(' ')[0]}}
+          </span>
+        </template>
+    </el-table-column>
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
+      <el-table-column label="项目地址">
+        <template slot-scope="{row}">
+          <span>
+            {{row.itemProvince === row.itemCity ? row.itemCity + row.itemArea  + row.itemAddress : row.itemProvince + row.itemCity + row.itemArea  + row.itemAddress}}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="handlerDetail(scope.row)">
@@ -66,64 +109,96 @@
     />
     <!-- xiangqing弹框 -->
 
-    <businessDetailDialog v-if="dialogFormVisible" :data-info="dataInfo" @close="detailClose" />
+    <businessDetailDialog
+      v-if="dialogFormVisible"
+      :data-info="dataInfo"
+      @close="detailClose"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import businessDetailDialog from '../../components/mycomponent/dialog/business/businessDetailDialog.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import businessDetailDialog from "../../components/mycomponent/dialog/business/businessDetailDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/business/business'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import { listPage } from "../../api/business/business";
+export default {
+  // 加入分页逻辑
   components: {
     GroupPage,
-    businessDetailDialog
+    businessDetailDialog,
   },
   mixins: [listMixin],
   data() {
     return {
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
       dialogFormVisible: false,
-      dataInfo: {}
-    }
+      dataInfo: {},
+    };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     tableRowClassName: tableRowClassName,
     detailClose() {
-      this.dialogFormVisible = false
+      this.dialogFormVisible = false;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     handlerDetail(row) {
-      console.log(row)
-      this.dialogFormVisible = true
-      this.dataInfo = row
-    }
-  }
-
-}
+      console.log(row);
+      this.dialogFormVisible = true;
+      this.dataInfo = row;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -184,11 +259,9 @@
     color: #6666;
     margin: 30px 10px;
   }
-
 }
 
 .order-dialog {
-
   .dialog-tab {
     .dialog-title {
       font-size: 16px;
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 7045eaf..e1c37c7 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -1,21 +1,29 @@
 <!--商机报备表单-->
 <template>
   <div class="report-container">
-    <div class="report-title">
-      基础报备
-    </div>
+    <div class="report-title">基础报备</div>
     <div class="report-from">
-      <div class="from-title">
-        基础信息
-      </div>
+      <div class="from-title">基础信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemName" title="项目名称" placeholder="请输入项目名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemName"
+            title="项目名称"
+            placeholder="请输入项目名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemBudget" title="项目预算" placeholder="请输入项目预算" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemBudget"
+            title="项目预算"
+            placeholder="请输入项目预算"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -25,7 +33,7 @@
               value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
-              style="width:380px"
+              style="width: 380px"
             />
           </inputVue>
         </div>
@@ -43,7 +51,13 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.phone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.phone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -60,8 +74,18 @@
         <div class="input-item">
           <RedStar />
           <inputVue title="商机状态" class="inputWidth">
-            <el-select v-model="addInfo.status" clearable placeholder="请选择" style="width:380px">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select
+              v-model="addInfo.status"
+              clearable
+              placeholder="请选择"
+              style="width: 380px"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </inputVue>
         </div>
@@ -72,10 +96,15 @@
               v-model="addInfo.itemProvince"
               clearable
               placeholder="省/市"
-              style="width:150px;margin-left: 55px;"
+              style="width: 150px; margin-left: 55px"
               @change="provinceChange"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -83,29 +112,53 @@
               v-model="addInfo.itemCity"
               clearable
               placeholder="市/区"
-              style="width:150px"
+              style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.itemArea" clearable placeholder="县/街道" style="width:150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+            <el-select
+              v-model="addInfo.itemArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.itemAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.itemAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        关联方信息
-      </div>
+      <div class="from-title">关联方信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.ownerName" title="业主方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.ownerName"
+            title="业主方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -131,7 +184,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.contractName" title="总包方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.contractName"
+            title="总包方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -189,7 +248,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.agentName" title="代理商名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.agentName"
+            title="代理商名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -214,19 +279,29 @@
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        产品信息
-      </div>
+      <div class="from-title">产品信息</div>
       <div class="from-table">
-        <div style="margin-left: 2px;">
-          <el-table ref="tb" :data="addInfo.productList" border class="el-tab" style="width: 100%;">
+        <div style="margin-left: 2px">
+          <el-table
+            ref="tb"
+            :data="addInfo.productList"
+            border
+            class="el-tab"
+            style="width: 100%"
+          >
             <el-table-column type="index" label="序号" width="50px" />
+            
             <el-table-column prop="brandName" label="产品品牌" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.brandName }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.brandName" placeholder="请输入产品品牌">
                 </el-input> -->
-                <el-select v-if="showEdit[$index]" v-model="brandName" clearable placeholder="请输入产品品牌">
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="brandName"
+                  clearable
+                  placeholder="请输入产品品牌"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.brandCode"
@@ -237,7 +312,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="categoryIds" label="产品品类" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.categoryIds }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.categoryIds" placeholder="请输入产品品类">
                 </el-input> -->
@@ -257,8 +332,26 @@
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column prop="productName" label="产品名称" width="200px">
+              <template slot-scope="{ row, $index }">
+                <span v-if="!showEdit[$index]">{{ row.productName }}</span>
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productName"
+                  clearable
+                  placeholder="请输入产品型号"
+                >
+                  <el-option
+                    v-for="item in CodeList"
+                    :key="item.id + 1"
+                    :label="item.productName"
+                    :value="item.productName"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="productCode" label="产品型号" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productCode }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productCode" placeholder="请输入产品型号">
                 </el-input> -->
@@ -277,38 +370,63 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="productQuantity" label="产品数量" width="200px">
-              <template slot-scope="{row,$index}">
+            <el-table-column
+              prop="productQuantity"
+              label="产品数量"
+              width="200px"
+            >
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productQuantity }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productQuantity" placeholder="请输入产品数量" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productQuantity"
+                  placeholder="请输入产品数量"
+                />
               </template>
             </el-table-column>
             <el-table-column prop="productPrice" label="产品单价" width="200px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productPrice }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productPrice" placeholder="请输入产品单价" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productPrice"
+                  placeholder="请输入产品单价"
+                />
               </template>
             </el-table-column>
-            <el-table-column header-align="center" align="center" width="200" label="操作">
-              <template slot-scope="{row,$index}">
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showUpdate($index, row)">
+            <el-table-column
+              header-align="center"
+              align="center"
+              width="200"
+              label="操作"
+            >
+              <template slot-scope="{ row, $index }">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showUpdate($index, row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showDelete($index, row)">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showDelete($index, row)"
+                >
                   删除
                 </el-button>
                 <el-button
                   v-if="showEdit[$index]"
                   size="small"
-                  style="color: #85ce61;"
+                  style="color: #85ce61"
                   @click="submit($index, row)"
                 >
                   确定
                 </el-button>
                 <el-button
-                  v-if="showEdit[$index] && isFirst[$index] >1"
+                  v-if="showEdit[$index] && isFirst[$index] > 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="cancelUpdate($index)"
                 >
                   取消
@@ -316,7 +434,7 @@
                 <el-button
                   v-if="showEdit[$index] && isFirst[$index] === 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="showDelete($index)"
                 >
                   删除
@@ -327,300 +445,323 @@
         </div>
       </div>
       <div>
-          <el-button class="table-btn" @click="handleAddBtn">
-            添加项目需求
-          </el-button>
-        </div>
+        <el-button class="table-btn" @click="handleAddBtn">
+          添加项目需求
+        </el-button>
+      </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+      <el-button type="info" class="close" @click="close"> 取消 </el-button>
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { list } from '../../api/product/product'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { add } from '../../api/business/business'
-import { order_area } from '../../api/order/order'
-import { Message } from 'element-ui'
+import { list } from "../../api/product/product";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { add } from "../../api/business/business";
+import { order_area } from "../../api/order/order";
+import { Message } from "element-ui";
 export default {
   components: {
-    RedStar, inputVue
+    RedStar,
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
+      brandName: "",
+      categoryIds: "",
       CodeList: [],
       brandList: [],
       categoryList: [],
       checkedDetail: [],
       showEdit: [], // 用来判断是否处于编辑状态
-      isFirst:[], // 用来判断是否初次添加
+      isFirst: [], // 用来判断是否初次添加
       options: [
-        { value: '0', label: '推进' },
-        { value: '1', label: '成交' },
-        { value: '2', label: '丢失' }
+        { value: "0", label: "推进" },
+        { value: "1", label: "成交" },
+        { value: "2", label: "丢失" },
       ],
       addInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
-      }
-    }
+        countyList: [],
+      },
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
+        console.log(newval, oldval);
         if (!this.addInfo.itemProvince) {
-          this.addInfo.itemCity = ''
-          this.addInfo.itemArea = ''
+          this.addInfo.itemCity = "";
+          this.addInfo.itemArea = "";
         } else if (!this.addInfo.itemCity) {
-          this.addInfo.itemArea = ''
+          this.addInfo.itemArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
   },
-  mounted() {
-
-  },
+  mounted() {},
   methods: {
     save() {
-      if(this.valiateForm()){
-        this.addInfo.productList = {
-        productCode: this.addInfo.productList.productCode,
-        productQuantity: this.addInfo.productList.productQuantity,
-        productPrice: this.addInfo.productList.productPrice,
-        productName: ''
-      }
-      add(this.addInfo).then(res => {
-        this.setData()
+      if (this.valiateForm()) {
+        //   this.addInfo.productList = {
+        //   productCode: this.addInfo.productList.productCode,
+        //   productQuantity: this.addInfo.productList.productQuantity,
+        //   productPrice: this.addInfo.productList.productPrice,
+        //   productName: ''
+        // }
+        if(this.addInfo.productList.length && this.showEdit.every(item => item=== false)){
+          add(this.addInfo).then((res) => {
+          this.setData();
           this.$message({
-            message: '保存成功',
-            type: 'success'
-          })
-      }) 
+            message: "保存成功",
+            type: "success",
+          });
+        });
+        }else{
+          this.$message.error('请先添加或保存产品信息')
+        }
       } else {
         this.$message({
-            message: '请先完整填写报备信息',
-            type: 'error'
-          })
+          message: "请先完整填写报备信息",
+          type: "error",
+        });
       }
-      
     },
     close() {
-      this.setData()
+      this.setData();
     },
     provinceChange(e) {
-      console.log(e)
-      const index = this.form.provinceList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.provinceList[index].id
+      console.log(e);
+      const index = this.form.provinceList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.provinceList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(e) {
-      const index = this.form.cityList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.cityList[index].id
+      const index = this.form.cityList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.cityList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     handleAddBtn() {
-      const obj = {}
-      obj.brandName = ''
-      obj.categoryIds = ''
-      obj.productCode = ''
-      obj.productQuantity = ''
-      obj.productPrice = ''
-      this.addInfo.productList.push(obj)
-      this.showEdit[this.addInfo.productList.length-1] = true
-      this.isFirst[this.addInfo.productList.length - 1] = 1
-      C_list().then(res => {
-        console.log(res, '品类')
-        this.categoryList = res.data
-      })
-      SelectList().then(res => {
-        console.log(res, '品牌')
-        this.brandList = res
-      })
+      if (
+        this.showEdit[this.addInfo.productList.length - 1] === false ||
+        this.addInfo.productList.length === 0
+      ) {
+        const obj = {};
+        obj.brandName = "";
+        obj.categoryIds = "";
+        obj.productCode = "";
+        obj.productQuantity = "";
+        obj.productPrice = "";
+        obj.productName = "";
+        this.addInfo.productList.push(obj);
+        this.showEdit[this.addInfo.productList.length - 1] = true;
+        this.isFirst[this.addInfo.productList.length - 1] = 1;
+        C_list().then((res) => {
+          this.categoryList = res.data;
+        });
+        SelectList().then((res) => {
+          this.brandList = res;
+        });
+      } else {
+        this.$message.warning("请先保存上一次");
+      }
     },
     showUpdate(index, row) {
-      this.showEdit[index] = true
-      this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
-      this.brandName = row.brandName
-      this.categoryIds = row.categoryIds
-      this.addInfo.productList.productCode = row.productCode
-      this.addInfo.productList.productQuantity = row.productQuantity
-      this.addInfo.productList.productPrice = row.productPrice
+      this.showEdit[index] = true;
+      this.$set(this.showEdit, index, true); // 这里要用$set方法，否则页面状态不更新
+      this.brandName = row.brandName;
+      this.categoryIds = row.categoryIds;
+      this.addInfo.productList.productCode = row.productCode;
+      this.addInfo.productList.productQuantity = row.productQuantity;
+      this.addInfo.productList.productPrice = row.productPrice;
+      this.addInfo.productList.productName = row.productName;
     },
-    showDelete(index, row){
-      this.$confirm('确认删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    showDelete(index, row) {
+      this.$confirm("确认删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.addInfo.productList = this.addInfo.productList.filter((item,Index) => index!==Index)
-          this.showEdit = this.showEdit.filter((item,Index) => index!==Index)
-          this.isFirst = this.isFirst.filter((item,Index) => index!==Index)
+          this.addInfo.productList = this.addInfo.productList.filter(
+            (item, Index) => index !== Index
+          );
+          this.showEdit = this.showEdit.filter(
+            (item, Index) => index !== Index
+          );
+          this.isFirst = this.isFirst.filter((item, Index) => index !== Index);
           this.$message({
-            message: '已删除',
-            type: 'success'
-          })
+            message: "已删除",
+            type: "success",
+          });
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
+      const index = this.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      const code = this.categoryList[index].id;
+      console.log(code);
+      list({ categoryId: code }).then((res) => {
+        console.log(res);
+        this.CodeList = res;
+        // this.addInfo.productList.productName =''
+        // this.addInfo.productList.productCode =''
+      });
     },
     cancelUpdate(index) {
-      this.$confirm('取消修改？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("取消修改？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.$set(this.showEdit, index, false)
+          this.$set(this.showEdit, index, false);
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     submit(index, row) {
       // 发送请求，隐藏输入框
-      const { productCode, brandName, categoryIds, addInfo: { productList: { productQuantity, productPrice } } } = this
-      if (categoryIds&& brandName  && productQuantity && productPrice) {
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
+      const {
+        brandName,
+        categoryIds,
+        addInfo: {
+          productList: { productQuantity, productPrice },
+        },
+      } = this;
+      if (categoryIds && brandName) {
+        if (productQuantity > 0 && productPrice > 0) {
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$message({
+            type: "success",
+            message: "已缓存，记得点击保存提交修改喔！",
+            duration: 888,
+            onClose: () => {
+              this.$set(this.showEdit, index, false); // vue添加属性的方法
+            },
+          });
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$set(this.isFirst, index, 2);
+          this.brandName = "";
+          this.categoryIds = "";
+          this.addInfo.productList.productCode = "";
+          this.addInfo.productList.productQuantity = "";
+          this.addInfo.productList.productPrice = "";
+          this.addInfo.productList.productName = "";
+        } else {
+          this.$message.error("单价或数量需大于等于1");
+        }
+      } else {
         this.$message({
-          type: 'success',
-          message: '已缓存，记得点击保存提交修改喔！',
-          duration: 888,
-          onClose: () => {
-            this.$set(this.showEdit, index, false) // vue添加属性的方法
-          }
-        })
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
-        this.$set(this.isFirst, index, 2)
-        this.brandName = ''
-        this.categoryIds = ''
-        this.addInfo.productList.productCode = ''
-        this.addInfo.productList.productQuantity = ''
-        this.addInfo.productList.productPrice = ''
-      } else{
-        this.$message({
-              message: "请先完整选择或填写信息",
-              type: "error",
-            });
+          message: "请先完整选择或填写信息",
+          type: "error",
+        });
       }
     },
     setData() {
       this.addInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
+      };
     },
     valiateForm() {
-      let arr = []
-      for(var item in this.addInfo) {
-        if(this.addInfo[item]){
-          arr.push(1)
-        }else{
-          arr.push(0)
+      let arr = [];
+      for (var item in this.addInfo) {
+        if (this.addInfo[item]) {
+          arr.push(1);
+        } else {
+          arr.push(0);
         }
       }
-      return arr.every(item => item === 1)
-    }
-  }
-}
+      return arr.every((item) => item === 1);
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -673,7 +814,6 @@
     .close {
       width: 100px;
     }
-
   }
 }
 </style>
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 6638e3b..c899612 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -30,7 +30,12 @@
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
     >
-      <el-table-column prop="index" width="100px" label="序号" />
+      <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="distributorCode" width="200px" label="经销商编号" />
       <el-table-column prop="distributorName" width="400px" label="经销商名称" />
       <el-table-column prop="companyNatureName" width="150px" label="单位性质" />
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index de08ec0..704a758 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -92,7 +92,12 @@
       style="width: 100%"
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="account" label="账号" />
       <el-table-column prop="province" label="省" />
       <el-table-column prop="city" label="市" />
@@ -176,9 +181,19 @@
     },
     reset() {
       this.selectInfo = {
-        recommendType: '',
-        recommendTitle: ''
+        account: '',
+        province: '',
+        city: '',
+        area: ''
       }
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((offset - 1) * 10)
+        })
+        this.tableData = res
+      })
+
     },
     Bdelete(row) {
       // console.log(row);
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index ae070d5..5cc02cf 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -55,6 +55,11 @@
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
       <el-table-column prop="date" label="序号" />
+      <!-- <el-table-column type="index" label="序号" > -->
+      <!-- <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column> -->
       <el-table-column prop="name" label="账号" />
       <el-table-column prop="address" label="用户名" />
       <el-table-column prop="address1" label="姓名" />
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index cc4041f..94f52ad 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -76,6 +76,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
+          @click="batchDelete"
         >
           删除
         </el-button>
@@ -91,9 +92,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      ref="multipleTable"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="messageCode" label="消息编号" />
       <el-table-column prop="messageTitle" label="消息标题" />
       <el-table-column prop="messageContent" label="消息内容" />
@@ -106,6 +113,7 @@
           <el-button
             type="text"
             size="small"
+            @click="remove(scope.row)"
           >
             删除
           </el-button>
@@ -127,7 +135,7 @@
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/move/message'
+import { listPage ,deleteBatch ,deleteInfo} from '../../api/move/message'
 export default { // 加入分页逻辑
   components: {
     MassageAddDialog,
@@ -184,6 +192,44 @@
       this.isShowAdd = true
       this.title = '消息推送编辑'
       this.$refs.addMessage.init(row)
+    },
+    // 批量删除
+    batchDelete(){
+      if(this.$refs.multipleTable.selection.length){
+        this.$confirm(`确认删除选中的这些数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+         //  得到选中行
+         const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            deleteBatch({ ids: ids }).then((res) => {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+              });
+              this.refresh();
+            });
+      }).catch(()=>{})
+      }else{
+        this.$message.error('请先选择需要删除的消息记录')
+      }
+    },
+    remove(row){
+      this.$confirm(`确认删除此项数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+        deleteInfo({id:row.id}).then(()=>{
+          this.$message.success('操作成功')
+          this.refresh();
+        })
+      }).catch(()=>{})
     }
   }
 }
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 0f26885..1c67bdb 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -35,7 +35,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="id" label="序号" />
+      <el-table-column type="index" label="序号" />
       <el-table-column prop="orderId" label="订单号" />
       <el-table-column prop="userName" label="下单人" />
       <el-table-column prop="userPhone" label="联系方式" />
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index ab6f457..514371a 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -403,11 +403,11 @@
     },
     valiateProduct() {
       // 验证产品列表
-      if (this.addInfo.productList.length) {
+      if (this.addInfo.productList.length && this.showEdit.every(item => item=== false)) {
         return true;
       } else {
         this.$message({
-          message: "产品列表不能为空",
+          message: "请先添加或保存产品信息",
           type: "error",
         });
         return false;
@@ -478,6 +478,7 @@
           }
         })
         row.productCode = this.addInfo.productList.productCode
+        
         row.brandName = this.brandName
         row.categoryIds = this.categoryIds
         row.productQuantity = this.addInfo.productList.productQuantity
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 2dfc80a..652300f 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -91,6 +91,11 @@
     >
       <el-table-column type="selection" width="55" />
       <!--      <el-table-column prop="index" width="75" label="序号" />-->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -284,7 +289,16 @@
       })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows)
+          res.rows = res.rows.map(item =>{
+            return{
+              编号:item.brandCode,
+              '名称':item.brandName,
+              性质:item.brandProperty,
+              品类:item.categoryStr,
+              供应商:item.supplierStr
+            }
+          })
+          outToExcel(res.rows,'品牌列表')
           loading.close() // 关闭加载动画
           this.$message({
             message: '导出成功',

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 4cae18a..25f5978 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -182,15 +182,16 @@
         temp.deliveryArea = this.AreaList[aindex].areaName;
         turnOrder(temp).then((res) => {
           this.$message.success("添加成功");
-          this.close();
+          this.$emit("close");
+          this.reset();
         });
-      }else {
-        console.log(this.valiatePhone())
-        if(this.valiatePhone() === false){
+      } else {
+        console.log(this.valiatePhone());
+        if (this.valiatePhone() === false) {
           this.$message.error("请检查手机号格式是否正确");
-        }else if(this.valiateProvince() === false){
+        } else if (this.valiateProvince() === false) {
           this.$message.error("请检查地址格式是否正确");
-        }else{
+        } else {
           this.$message.error("请正确填写信息");
         }
       }
diff --git a/src/components/mycomponent/groupPage.vue b/src/components/mycomponent/groupPage.vue
index 666edc1..372e253 100644
--- a/src/components/mycomponent/groupPage.vue
+++ b/src/components/mycomponent/groupPage.vue
@@ -1,7 +1,7 @@
 <!--分页组件-->
 <template>
   <div class="footer">
-    <div>共{{ total }}页记录 第{{ offset }}/{{ total }}页</div>
+    <div>共{{ count }}条记录 第{{ offset }}/{{ total }}页</div>
     <div>
       <el-pagination
         ref="compontentPage"
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index 4398baa..241cdd4 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -5,22 +5,48 @@
       <div class="productInput">
         项目名称
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemName" placeholder="请输入项目名称" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemName"
+            placeholder="请输入项目名称"
+            clearable
+            class="product-input"
+          />
         </div>
         项目预算
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemBudget" placeholder="请输入项目预算" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemBudget"
+            placeholder="请输入项目预算"
+            clearable
+            class="product-input"
+          />
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
+          <el-date-picker
+            v-model="selectInfo.itemDuration"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择日期"
+            class="product-input"
+          />
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
       </div>
@@ -39,14 +65,31 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
       <el-table-column prop="itemBudget" label="项目预算" />
-      <el-table-column prop="itemDuration" label="预计工期" />
+      <el-table-column prop="itemDuration" label="预计工期" >
+        <template slot-scope="{row}">
+          <span>
+           {{row.itemDuration.split(' ')[0]}}
+          </span>
+        </template>
+    </el-table-column>
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
+      <el-table-column label="项目地址">
+        <template slot-scope="{row}">
+          <span>
+            {{row.itemProvince === row.itemCity ? row.itemCity + row.itemArea  + row.itemAddress : row.itemProvince + row.itemCity + row.itemArea  + row.itemAddress}}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="handlerDetail(scope.row)">
@@ -66,64 +109,96 @@
     />
     <!-- xiangqing弹框 -->
 
-    <businessDetailDialog v-if="dialogFormVisible" :data-info="dataInfo" @close="detailClose" />
+    <businessDetailDialog
+      v-if="dialogFormVisible"
+      :data-info="dataInfo"
+      @close="detailClose"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import businessDetailDialog from '../../components/mycomponent/dialog/business/businessDetailDialog.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import businessDetailDialog from "../../components/mycomponent/dialog/business/businessDetailDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/business/business'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import { listPage } from "../../api/business/business";
+export default {
+  // 加入分页逻辑
   components: {
     GroupPage,
-    businessDetailDialog
+    businessDetailDialog,
   },
   mixins: [listMixin],
   data() {
     return {
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
       dialogFormVisible: false,
-      dataInfo: {}
-    }
+      dataInfo: {},
+    };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     tableRowClassName: tableRowClassName,
     detailClose() {
-      this.dialogFormVisible = false
+      this.dialogFormVisible = false;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     handlerDetail(row) {
-      console.log(row)
-      this.dialogFormVisible = true
-      this.dataInfo = row
-    }
-  }
-
-}
+      console.log(row);
+      this.dialogFormVisible = true;
+      this.dataInfo = row;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -184,11 +259,9 @@
     color: #6666;
     margin: 30px 10px;
   }
-
 }
 
 .order-dialog {
-
   .dialog-tab {
     .dialog-title {
       font-size: 16px;
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 7045eaf..e1c37c7 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -1,21 +1,29 @@
 <!--商机报备表单-->
 <template>
   <div class="report-container">
-    <div class="report-title">
-      基础报备
-    </div>
+    <div class="report-title">基础报备</div>
     <div class="report-from">
-      <div class="from-title">
-        基础信息
-      </div>
+      <div class="from-title">基础信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemName" title="项目名称" placeholder="请输入项目名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemName"
+            title="项目名称"
+            placeholder="请输入项目名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemBudget" title="项目预算" placeholder="请输入项目预算" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemBudget"
+            title="项目预算"
+            placeholder="请输入项目预算"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -25,7 +33,7 @@
               value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
-              style="width:380px"
+              style="width: 380px"
             />
           </inputVue>
         </div>
@@ -43,7 +51,13 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.phone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.phone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -60,8 +74,18 @@
         <div class="input-item">
           <RedStar />
           <inputVue title="商机状态" class="inputWidth">
-            <el-select v-model="addInfo.status" clearable placeholder="请选择" style="width:380px">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select
+              v-model="addInfo.status"
+              clearable
+              placeholder="请选择"
+              style="width: 380px"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </inputVue>
         </div>
@@ -72,10 +96,15 @@
               v-model="addInfo.itemProvince"
               clearable
               placeholder="省/市"
-              style="width:150px;margin-left: 55px;"
+              style="width: 150px; margin-left: 55px"
               @change="provinceChange"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -83,29 +112,53 @@
               v-model="addInfo.itemCity"
               clearable
               placeholder="市/区"
-              style="width:150px"
+              style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.itemArea" clearable placeholder="县/街道" style="width:150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+            <el-select
+              v-model="addInfo.itemArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.itemAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.itemAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        关联方信息
-      </div>
+      <div class="from-title">关联方信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.ownerName" title="业主方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.ownerName"
+            title="业主方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -131,7 +184,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.contractName" title="总包方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.contractName"
+            title="总包方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -189,7 +248,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.agentName" title="代理商名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.agentName"
+            title="代理商名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -214,19 +279,29 @@
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        产品信息
-      </div>
+      <div class="from-title">产品信息</div>
       <div class="from-table">
-        <div style="margin-left: 2px;">
-          <el-table ref="tb" :data="addInfo.productList" border class="el-tab" style="width: 100%;">
+        <div style="margin-left: 2px">
+          <el-table
+            ref="tb"
+            :data="addInfo.productList"
+            border
+            class="el-tab"
+            style="width: 100%"
+          >
             <el-table-column type="index" label="序号" width="50px" />
+            
             <el-table-column prop="brandName" label="产品品牌" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.brandName }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.brandName" placeholder="请输入产品品牌">
                 </el-input> -->
-                <el-select v-if="showEdit[$index]" v-model="brandName" clearable placeholder="请输入产品品牌">
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="brandName"
+                  clearable
+                  placeholder="请输入产品品牌"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.brandCode"
@@ -237,7 +312,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="categoryIds" label="产品品类" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.categoryIds }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.categoryIds" placeholder="请输入产品品类">
                 </el-input> -->
@@ -257,8 +332,26 @@
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column prop="productName" label="产品名称" width="200px">
+              <template slot-scope="{ row, $index }">
+                <span v-if="!showEdit[$index]">{{ row.productName }}</span>
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productName"
+                  clearable
+                  placeholder="请输入产品型号"
+                >
+                  <el-option
+                    v-for="item in CodeList"
+                    :key="item.id + 1"
+                    :label="item.productName"
+                    :value="item.productName"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="productCode" label="产品型号" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productCode }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productCode" placeholder="请输入产品型号">
                 </el-input> -->
@@ -277,38 +370,63 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="productQuantity" label="产品数量" width="200px">
-              <template slot-scope="{row,$index}">
+            <el-table-column
+              prop="productQuantity"
+              label="产品数量"
+              width="200px"
+            >
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productQuantity }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productQuantity" placeholder="请输入产品数量" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productQuantity"
+                  placeholder="请输入产品数量"
+                />
               </template>
             </el-table-column>
             <el-table-column prop="productPrice" label="产品单价" width="200px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productPrice }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productPrice" placeholder="请输入产品单价" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productPrice"
+                  placeholder="请输入产品单价"
+                />
               </template>
             </el-table-column>
-            <el-table-column header-align="center" align="center" width="200" label="操作">
-              <template slot-scope="{row,$index}">
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showUpdate($index, row)">
+            <el-table-column
+              header-align="center"
+              align="center"
+              width="200"
+              label="操作"
+            >
+              <template slot-scope="{ row, $index }">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showUpdate($index, row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showDelete($index, row)">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showDelete($index, row)"
+                >
                   删除
                 </el-button>
                 <el-button
                   v-if="showEdit[$index]"
                   size="small"
-                  style="color: #85ce61;"
+                  style="color: #85ce61"
                   @click="submit($index, row)"
                 >
                   确定
                 </el-button>
                 <el-button
-                  v-if="showEdit[$index] && isFirst[$index] >1"
+                  v-if="showEdit[$index] && isFirst[$index] > 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="cancelUpdate($index)"
                 >
                   取消
@@ -316,7 +434,7 @@
                 <el-button
                   v-if="showEdit[$index] && isFirst[$index] === 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="showDelete($index)"
                 >
                   删除
@@ -327,300 +445,323 @@
         </div>
       </div>
       <div>
-          <el-button class="table-btn" @click="handleAddBtn">
-            添加项目需求
-          </el-button>
-        </div>
+        <el-button class="table-btn" @click="handleAddBtn">
+          添加项目需求
+        </el-button>
+      </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+      <el-button type="info" class="close" @click="close"> 取消 </el-button>
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { list } from '../../api/product/product'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { add } from '../../api/business/business'
-import { order_area } from '../../api/order/order'
-import { Message } from 'element-ui'
+import { list } from "../../api/product/product";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { add } from "../../api/business/business";
+import { order_area } from "../../api/order/order";
+import { Message } from "element-ui";
 export default {
   components: {
-    RedStar, inputVue
+    RedStar,
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
+      brandName: "",
+      categoryIds: "",
       CodeList: [],
       brandList: [],
       categoryList: [],
       checkedDetail: [],
       showEdit: [], // 用来判断是否处于编辑状态
-      isFirst:[], // 用来判断是否初次添加
+      isFirst: [], // 用来判断是否初次添加
       options: [
-        { value: '0', label: '推进' },
-        { value: '1', label: '成交' },
-        { value: '2', label: '丢失' }
+        { value: "0", label: "推进" },
+        { value: "1", label: "成交" },
+        { value: "2", label: "丢失" },
       ],
       addInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
-      }
-    }
+        countyList: [],
+      },
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
+        console.log(newval, oldval);
         if (!this.addInfo.itemProvince) {
-          this.addInfo.itemCity = ''
-          this.addInfo.itemArea = ''
+          this.addInfo.itemCity = "";
+          this.addInfo.itemArea = "";
         } else if (!this.addInfo.itemCity) {
-          this.addInfo.itemArea = ''
+          this.addInfo.itemArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
   },
-  mounted() {
-
-  },
+  mounted() {},
   methods: {
     save() {
-      if(this.valiateForm()){
-        this.addInfo.productList = {
-        productCode: this.addInfo.productList.productCode,
-        productQuantity: this.addInfo.productList.productQuantity,
-        productPrice: this.addInfo.productList.productPrice,
-        productName: ''
-      }
-      add(this.addInfo).then(res => {
-        this.setData()
+      if (this.valiateForm()) {
+        //   this.addInfo.productList = {
+        //   productCode: this.addInfo.productList.productCode,
+        //   productQuantity: this.addInfo.productList.productQuantity,
+        //   productPrice: this.addInfo.productList.productPrice,
+        //   productName: ''
+        // }
+        if(this.addInfo.productList.length && this.showEdit.every(item => item=== false)){
+          add(this.addInfo).then((res) => {
+          this.setData();
           this.$message({
-            message: '保存成功',
-            type: 'success'
-          })
-      }) 
+            message: "保存成功",
+            type: "success",
+          });
+        });
+        }else{
+          this.$message.error('请先添加或保存产品信息')
+        }
       } else {
         this.$message({
-            message: '请先完整填写报备信息',
-            type: 'error'
-          })
+          message: "请先完整填写报备信息",
+          type: "error",
+        });
       }
-      
     },
     close() {
-      this.setData()
+      this.setData();
     },
     provinceChange(e) {
-      console.log(e)
-      const index = this.form.provinceList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.provinceList[index].id
+      console.log(e);
+      const index = this.form.provinceList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.provinceList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(e) {
-      const index = this.form.cityList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.cityList[index].id
+      const index = this.form.cityList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.cityList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     handleAddBtn() {
-      const obj = {}
-      obj.brandName = ''
-      obj.categoryIds = ''
-      obj.productCode = ''
-      obj.productQuantity = ''
-      obj.productPrice = ''
-      this.addInfo.productList.push(obj)
-      this.showEdit[this.addInfo.productList.length-1] = true
-      this.isFirst[this.addInfo.productList.length - 1] = 1
-      C_list().then(res => {
-        console.log(res, '品类')
-        this.categoryList = res.data
-      })
-      SelectList().then(res => {
-        console.log(res, '品牌')
-        this.brandList = res
-      })
+      if (
+        this.showEdit[this.addInfo.productList.length - 1] === false ||
+        this.addInfo.productList.length === 0
+      ) {
+        const obj = {};
+        obj.brandName = "";
+        obj.categoryIds = "";
+        obj.productCode = "";
+        obj.productQuantity = "";
+        obj.productPrice = "";
+        obj.productName = "";
+        this.addInfo.productList.push(obj);
+        this.showEdit[this.addInfo.productList.length - 1] = true;
+        this.isFirst[this.addInfo.productList.length - 1] = 1;
+        C_list().then((res) => {
+          this.categoryList = res.data;
+        });
+        SelectList().then((res) => {
+          this.brandList = res;
+        });
+      } else {
+        this.$message.warning("请先保存上一次");
+      }
     },
     showUpdate(index, row) {
-      this.showEdit[index] = true
-      this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
-      this.brandName = row.brandName
-      this.categoryIds = row.categoryIds
-      this.addInfo.productList.productCode = row.productCode
-      this.addInfo.productList.productQuantity = row.productQuantity
-      this.addInfo.productList.productPrice = row.productPrice
+      this.showEdit[index] = true;
+      this.$set(this.showEdit, index, true); // 这里要用$set方法，否则页面状态不更新
+      this.brandName = row.brandName;
+      this.categoryIds = row.categoryIds;
+      this.addInfo.productList.productCode = row.productCode;
+      this.addInfo.productList.productQuantity = row.productQuantity;
+      this.addInfo.productList.productPrice = row.productPrice;
+      this.addInfo.productList.productName = row.productName;
     },
-    showDelete(index, row){
-      this.$confirm('确认删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    showDelete(index, row) {
+      this.$confirm("确认删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.addInfo.productList = this.addInfo.productList.filter((item,Index) => index!==Index)
-          this.showEdit = this.showEdit.filter((item,Index) => index!==Index)
-          this.isFirst = this.isFirst.filter((item,Index) => index!==Index)
+          this.addInfo.productList = this.addInfo.productList.filter(
+            (item, Index) => index !== Index
+          );
+          this.showEdit = this.showEdit.filter(
+            (item, Index) => index !== Index
+          );
+          this.isFirst = this.isFirst.filter((item, Index) => index !== Index);
           this.$message({
-            message: '已删除',
-            type: 'success'
-          })
+            message: "已删除",
+            type: "success",
+          });
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
+      const index = this.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      const code = this.categoryList[index].id;
+      console.log(code);
+      list({ categoryId: code }).then((res) => {
+        console.log(res);
+        this.CodeList = res;
+        // this.addInfo.productList.productName =''
+        // this.addInfo.productList.productCode =''
+      });
     },
     cancelUpdate(index) {
-      this.$confirm('取消修改？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("取消修改？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.$set(this.showEdit, index, false)
+          this.$set(this.showEdit, index, false);
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     submit(index, row) {
       // 发送请求，隐藏输入框
-      const { productCode, brandName, categoryIds, addInfo: { productList: { productQuantity, productPrice } } } = this
-      if (categoryIds&& brandName  && productQuantity && productPrice) {
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
+      const {
+        brandName,
+        categoryIds,
+        addInfo: {
+          productList: { productQuantity, productPrice },
+        },
+      } = this;
+      if (categoryIds && brandName) {
+        if (productQuantity > 0 && productPrice > 0) {
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$message({
+            type: "success",
+            message: "已缓存，记得点击保存提交修改喔！",
+            duration: 888,
+            onClose: () => {
+              this.$set(this.showEdit, index, false); // vue添加属性的方法
+            },
+          });
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$set(this.isFirst, index, 2);
+          this.brandName = "";
+          this.categoryIds = "";
+          this.addInfo.productList.productCode = "";
+          this.addInfo.productList.productQuantity = "";
+          this.addInfo.productList.productPrice = "";
+          this.addInfo.productList.productName = "";
+        } else {
+          this.$message.error("单价或数量需大于等于1");
+        }
+      } else {
         this.$message({
-          type: 'success',
-          message: '已缓存，记得点击保存提交修改喔！',
-          duration: 888,
-          onClose: () => {
-            this.$set(this.showEdit, index, false) // vue添加属性的方法
-          }
-        })
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
-        this.$set(this.isFirst, index, 2)
-        this.brandName = ''
-        this.categoryIds = ''
-        this.addInfo.productList.productCode = ''
-        this.addInfo.productList.productQuantity = ''
-        this.addInfo.productList.productPrice = ''
-      } else{
-        this.$message({
-              message: "请先完整选择或填写信息",
-              type: "error",
-            });
+          message: "请先完整选择或填写信息",
+          type: "error",
+        });
       }
     },
     setData() {
       this.addInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
+      };
     },
     valiateForm() {
-      let arr = []
-      for(var item in this.addInfo) {
-        if(this.addInfo[item]){
-          arr.push(1)
-        }else{
-          arr.push(0)
+      let arr = [];
+      for (var item in this.addInfo) {
+        if (this.addInfo[item]) {
+          arr.push(1);
+        } else {
+          arr.push(0);
         }
       }
-      return arr.every(item => item === 1)
-    }
-  }
-}
+      return arr.every((item) => item === 1);
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -673,7 +814,6 @@
     .close {
       width: 100px;
     }
-
   }
 }
 </style>
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 6638e3b..c899612 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -30,7 +30,12 @@
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
     >
-      <el-table-column prop="index" width="100px" label="序号" />
+      <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="distributorCode" width="200px" label="经销商编号" />
       <el-table-column prop="distributorName" width="400px" label="经销商名称" />
       <el-table-column prop="companyNatureName" width="150px" label="单位性质" />
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index de08ec0..704a758 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -92,7 +92,12 @@
       style="width: 100%"
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="account" label="账号" />
       <el-table-column prop="province" label="省" />
       <el-table-column prop="city" label="市" />
@@ -176,9 +181,19 @@
     },
     reset() {
       this.selectInfo = {
-        recommendType: '',
-        recommendTitle: ''
+        account: '',
+        province: '',
+        city: '',
+        area: ''
       }
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((offset - 1) * 10)
+        })
+        this.tableData = res
+      })
+
     },
     Bdelete(row) {
       // console.log(row);
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index ae070d5..5cc02cf 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -55,6 +55,11 @@
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
       <el-table-column prop="date" label="序号" />
+      <!-- <el-table-column type="index" label="序号" > -->
+      <!-- <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column> -->
       <el-table-column prop="name" label="账号" />
       <el-table-column prop="address" label="用户名" />
       <el-table-column prop="address1" label="姓名" />
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index cc4041f..94f52ad 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -76,6 +76,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
+          @click="batchDelete"
         >
           删除
         </el-button>
@@ -91,9 +92,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      ref="multipleTable"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="messageCode" label="消息编号" />
       <el-table-column prop="messageTitle" label="消息标题" />
       <el-table-column prop="messageContent" label="消息内容" />
@@ -106,6 +113,7 @@
           <el-button
             type="text"
             size="small"
+            @click="remove(scope.row)"
           >
             删除
           </el-button>
@@ -127,7 +135,7 @@
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/move/message'
+import { listPage ,deleteBatch ,deleteInfo} from '../../api/move/message'
 export default { // 加入分页逻辑
   components: {
     MassageAddDialog,
@@ -184,6 +192,44 @@
       this.isShowAdd = true
       this.title = '消息推送编辑'
       this.$refs.addMessage.init(row)
+    },
+    // 批量删除
+    batchDelete(){
+      if(this.$refs.multipleTable.selection.length){
+        this.$confirm(`确认删除选中的这些数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+         //  得到选中行
+         const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            deleteBatch({ ids: ids }).then((res) => {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+              });
+              this.refresh();
+            });
+      }).catch(()=>{})
+      }else{
+        this.$message.error('请先选择需要删除的消息记录')
+      }
+    },
+    remove(row){
+      this.$confirm(`确认删除此项数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+        deleteInfo({id:row.id}).then(()=>{
+          this.$message.success('操作成功')
+          this.refresh();
+        })
+      }).catch(()=>{})
     }
   }
 }
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 0f26885..1c67bdb 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -35,7 +35,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="id" label="序号" />
+      <el-table-column type="index" label="序号" />
       <el-table-column prop="orderId" label="订单号" />
       <el-table-column prop="userName" label="下单人" />
       <el-table-column prop="userPhone" label="联系方式" />
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index ab6f457..514371a 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -403,11 +403,11 @@
     },
     valiateProduct() {
       // 验证产品列表
-      if (this.addInfo.productList.length) {
+      if (this.addInfo.productList.length && this.showEdit.every(item => item=== false)) {
         return true;
       } else {
         this.$message({
-          message: "产品列表不能为空",
+          message: "请先添加或保存产品信息",
           type: "error",
         });
         return false;
@@ -478,6 +478,7 @@
           }
         })
         row.productCode = this.addInfo.productList.productCode
+        
         row.brandName = this.brandName
         row.categoryIds = this.categoryIds
         row.productQuantity = this.addInfo.productList.productQuantity
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 2dfc80a..652300f 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -91,6 +91,11 @@
     >
       <el-table-column type="selection" width="55" />
       <!--      <el-table-column prop="index" width="75" label="序号" />-->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -284,7 +289,16 @@
       })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows)
+          res.rows = res.rows.map(item =>{
+            return{
+              编号:item.brandCode,
+              '名称':item.brandName,
+              性质:item.brandProperty,
+              品类:item.categoryStr,
+              供应商:item.supplierStr
+            }
+          })
+          outToExcel(res.rows,'品牌列表')
           loading.close() // 关闭加载动画
           this.$message({
             message: '导出成功',
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 8767f49..71ae178 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -82,7 +82,12 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" width="60" />
+      <!-- <el-table-column type="index" label="序号" width="60" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 4cae18a..25f5978 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -182,15 +182,16 @@
         temp.deliveryArea = this.AreaList[aindex].areaName;
         turnOrder(temp).then((res) => {
           this.$message.success("添加成功");
-          this.close();
+          this.$emit("close");
+          this.reset();
         });
-      }else {
-        console.log(this.valiatePhone())
-        if(this.valiatePhone() === false){
+      } else {
+        console.log(this.valiatePhone());
+        if (this.valiatePhone() === false) {
           this.$message.error("请检查手机号格式是否正确");
-        }else if(this.valiateProvince() === false){
+        } else if (this.valiateProvince() === false) {
           this.$message.error("请检查地址格式是否正确");
-        }else{
+        } else {
           this.$message.error("请正确填写信息");
         }
       }
diff --git a/src/components/mycomponent/groupPage.vue b/src/components/mycomponent/groupPage.vue
index 666edc1..372e253 100644
--- a/src/components/mycomponent/groupPage.vue
+++ b/src/components/mycomponent/groupPage.vue
@@ -1,7 +1,7 @@
 <!--分页组件-->
 <template>
   <div class="footer">
-    <div>共{{ total }}页记录 第{{ offset }}/{{ total }}页</div>
+    <div>共{{ count }}条记录 第{{ offset }}/{{ total }}页</div>
     <div>
       <el-pagination
         ref="compontentPage"
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index 4398baa..241cdd4 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -5,22 +5,48 @@
       <div class="productInput">
         项目名称
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemName" placeholder="请输入项目名称" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemName"
+            placeholder="请输入项目名称"
+            clearable
+            class="product-input"
+          />
         </div>
         项目预算
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemBudget" placeholder="请输入项目预算" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemBudget"
+            placeholder="请输入项目预算"
+            clearable
+            class="product-input"
+          />
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
+          <el-date-picker
+            v-model="selectInfo.itemDuration"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择日期"
+            class="product-input"
+          />
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
       </div>
@@ -39,14 +65,31 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
       <el-table-column prop="itemBudget" label="项目预算" />
-      <el-table-column prop="itemDuration" label="预计工期" />
+      <el-table-column prop="itemDuration" label="预计工期" >
+        <template slot-scope="{row}">
+          <span>
+           {{row.itemDuration.split(' ')[0]}}
+          </span>
+        </template>
+    </el-table-column>
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
+      <el-table-column label="项目地址">
+        <template slot-scope="{row}">
+          <span>
+            {{row.itemProvince === row.itemCity ? row.itemCity + row.itemArea  + row.itemAddress : row.itemProvince + row.itemCity + row.itemArea  + row.itemAddress}}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="handlerDetail(scope.row)">
@@ -66,64 +109,96 @@
     />
     <!-- xiangqing弹框 -->
 
-    <businessDetailDialog v-if="dialogFormVisible" :data-info="dataInfo" @close="detailClose" />
+    <businessDetailDialog
+      v-if="dialogFormVisible"
+      :data-info="dataInfo"
+      @close="detailClose"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import businessDetailDialog from '../../components/mycomponent/dialog/business/businessDetailDialog.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import businessDetailDialog from "../../components/mycomponent/dialog/business/businessDetailDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/business/business'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import { listPage } from "../../api/business/business";
+export default {
+  // 加入分页逻辑
   components: {
     GroupPage,
-    businessDetailDialog
+    businessDetailDialog,
   },
   mixins: [listMixin],
   data() {
     return {
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
       dialogFormVisible: false,
-      dataInfo: {}
-    }
+      dataInfo: {},
+    };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     tableRowClassName: tableRowClassName,
     detailClose() {
-      this.dialogFormVisible = false
+      this.dialogFormVisible = false;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     handlerDetail(row) {
-      console.log(row)
-      this.dialogFormVisible = true
-      this.dataInfo = row
-    }
-  }
-
-}
+      console.log(row);
+      this.dialogFormVisible = true;
+      this.dataInfo = row;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -184,11 +259,9 @@
     color: #6666;
     margin: 30px 10px;
   }
-
 }
 
 .order-dialog {
-
   .dialog-tab {
     .dialog-title {
       font-size: 16px;
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 7045eaf..e1c37c7 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -1,21 +1,29 @@
 <!--商机报备表单-->
 <template>
   <div class="report-container">
-    <div class="report-title">
-      基础报备
-    </div>
+    <div class="report-title">基础报备</div>
     <div class="report-from">
-      <div class="from-title">
-        基础信息
-      </div>
+      <div class="from-title">基础信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemName" title="项目名称" placeholder="请输入项目名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemName"
+            title="项目名称"
+            placeholder="请输入项目名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemBudget" title="项目预算" placeholder="请输入项目预算" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemBudget"
+            title="项目预算"
+            placeholder="请输入项目预算"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -25,7 +33,7 @@
               value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
-              style="width:380px"
+              style="width: 380px"
             />
           </inputVue>
         </div>
@@ -43,7 +51,13 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.phone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.phone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -60,8 +74,18 @@
         <div class="input-item">
           <RedStar />
           <inputVue title="商机状态" class="inputWidth">
-            <el-select v-model="addInfo.status" clearable placeholder="请选择" style="width:380px">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select
+              v-model="addInfo.status"
+              clearable
+              placeholder="请选择"
+              style="width: 380px"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </inputVue>
         </div>
@@ -72,10 +96,15 @@
               v-model="addInfo.itemProvince"
               clearable
               placeholder="省/市"
-              style="width:150px;margin-left: 55px;"
+              style="width: 150px; margin-left: 55px"
               @change="provinceChange"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -83,29 +112,53 @@
               v-model="addInfo.itemCity"
               clearable
               placeholder="市/区"
-              style="width:150px"
+              style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.itemArea" clearable placeholder="县/街道" style="width:150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+            <el-select
+              v-model="addInfo.itemArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.itemAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.itemAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        关联方信息
-      </div>
+      <div class="from-title">关联方信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.ownerName" title="业主方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.ownerName"
+            title="业主方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -131,7 +184,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.contractName" title="总包方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.contractName"
+            title="总包方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -189,7 +248,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.agentName" title="代理商名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.agentName"
+            title="代理商名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -214,19 +279,29 @@
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        产品信息
-      </div>
+      <div class="from-title">产品信息</div>
       <div class="from-table">
-        <div style="margin-left: 2px;">
-          <el-table ref="tb" :data="addInfo.productList" border class="el-tab" style="width: 100%;">
+        <div style="margin-left: 2px">
+          <el-table
+            ref="tb"
+            :data="addInfo.productList"
+            border
+            class="el-tab"
+            style="width: 100%"
+          >
             <el-table-column type="index" label="序号" width="50px" />
+            
             <el-table-column prop="brandName" label="产品品牌" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.brandName }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.brandName" placeholder="请输入产品品牌">
                 </el-input> -->
-                <el-select v-if="showEdit[$index]" v-model="brandName" clearable placeholder="请输入产品品牌">
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="brandName"
+                  clearable
+                  placeholder="请输入产品品牌"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.brandCode"
@@ -237,7 +312,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="categoryIds" label="产品品类" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.categoryIds }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.categoryIds" placeholder="请输入产品品类">
                 </el-input> -->
@@ -257,8 +332,26 @@
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column prop="productName" label="产品名称" width="200px">
+              <template slot-scope="{ row, $index }">
+                <span v-if="!showEdit[$index]">{{ row.productName }}</span>
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productName"
+                  clearable
+                  placeholder="请输入产品型号"
+                >
+                  <el-option
+                    v-for="item in CodeList"
+                    :key="item.id + 1"
+                    :label="item.productName"
+                    :value="item.productName"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="productCode" label="产品型号" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productCode }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productCode" placeholder="请输入产品型号">
                 </el-input> -->
@@ -277,38 +370,63 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="productQuantity" label="产品数量" width="200px">
-              <template slot-scope="{row,$index}">
+            <el-table-column
+              prop="productQuantity"
+              label="产品数量"
+              width="200px"
+            >
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productQuantity }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productQuantity" placeholder="请输入产品数量" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productQuantity"
+                  placeholder="请输入产品数量"
+                />
               </template>
             </el-table-column>
             <el-table-column prop="productPrice" label="产品单价" width="200px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productPrice }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productPrice" placeholder="请输入产品单价" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productPrice"
+                  placeholder="请输入产品单价"
+                />
               </template>
             </el-table-column>
-            <el-table-column header-align="center" align="center" width="200" label="操作">
-              <template slot-scope="{row,$index}">
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showUpdate($index, row)">
+            <el-table-column
+              header-align="center"
+              align="center"
+              width="200"
+              label="操作"
+            >
+              <template slot-scope="{ row, $index }">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showUpdate($index, row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showDelete($index, row)">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showDelete($index, row)"
+                >
                   删除
                 </el-button>
                 <el-button
                   v-if="showEdit[$index]"
                   size="small"
-                  style="color: #85ce61;"
+                  style="color: #85ce61"
                   @click="submit($index, row)"
                 >
                   确定
                 </el-button>
                 <el-button
-                  v-if="showEdit[$index] && isFirst[$index] >1"
+                  v-if="showEdit[$index] && isFirst[$index] > 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="cancelUpdate($index)"
                 >
                   取消
@@ -316,7 +434,7 @@
                 <el-button
                   v-if="showEdit[$index] && isFirst[$index] === 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="showDelete($index)"
                 >
                   删除
@@ -327,300 +445,323 @@
         </div>
       </div>
       <div>
-          <el-button class="table-btn" @click="handleAddBtn">
-            添加项目需求
-          </el-button>
-        </div>
+        <el-button class="table-btn" @click="handleAddBtn">
+          添加项目需求
+        </el-button>
+      </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+      <el-button type="info" class="close" @click="close"> 取消 </el-button>
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { list } from '../../api/product/product'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { add } from '../../api/business/business'
-import { order_area } from '../../api/order/order'
-import { Message } from 'element-ui'
+import { list } from "../../api/product/product";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { add } from "../../api/business/business";
+import { order_area } from "../../api/order/order";
+import { Message } from "element-ui";
 export default {
   components: {
-    RedStar, inputVue
+    RedStar,
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
+      brandName: "",
+      categoryIds: "",
       CodeList: [],
       brandList: [],
       categoryList: [],
       checkedDetail: [],
       showEdit: [], // 用来判断是否处于编辑状态
-      isFirst:[], // 用来判断是否初次添加
+      isFirst: [], // 用来判断是否初次添加
       options: [
-        { value: '0', label: '推进' },
-        { value: '1', label: '成交' },
-        { value: '2', label: '丢失' }
+        { value: "0", label: "推进" },
+        { value: "1", label: "成交" },
+        { value: "2", label: "丢失" },
       ],
       addInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
-      }
-    }
+        countyList: [],
+      },
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
+        console.log(newval, oldval);
         if (!this.addInfo.itemProvince) {
-          this.addInfo.itemCity = ''
-          this.addInfo.itemArea = ''
+          this.addInfo.itemCity = "";
+          this.addInfo.itemArea = "";
         } else if (!this.addInfo.itemCity) {
-          this.addInfo.itemArea = ''
+          this.addInfo.itemArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
   },
-  mounted() {
-
-  },
+  mounted() {},
   methods: {
     save() {
-      if(this.valiateForm()){
-        this.addInfo.productList = {
-        productCode: this.addInfo.productList.productCode,
-        productQuantity: this.addInfo.productList.productQuantity,
-        productPrice: this.addInfo.productList.productPrice,
-        productName: ''
-      }
-      add(this.addInfo).then(res => {
-        this.setData()
+      if (this.valiateForm()) {
+        //   this.addInfo.productList = {
+        //   productCode: this.addInfo.productList.productCode,
+        //   productQuantity: this.addInfo.productList.productQuantity,
+        //   productPrice: this.addInfo.productList.productPrice,
+        //   productName: ''
+        // }
+        if(this.addInfo.productList.length && this.showEdit.every(item => item=== false)){
+          add(this.addInfo).then((res) => {
+          this.setData();
           this.$message({
-            message: '保存成功',
-            type: 'success'
-          })
-      }) 
+            message: "保存成功",
+            type: "success",
+          });
+        });
+        }else{
+          this.$message.error('请先添加或保存产品信息')
+        }
       } else {
         this.$message({
-            message: '请先完整填写报备信息',
-            type: 'error'
-          })
+          message: "请先完整填写报备信息",
+          type: "error",
+        });
       }
-      
     },
     close() {
-      this.setData()
+      this.setData();
     },
     provinceChange(e) {
-      console.log(e)
-      const index = this.form.provinceList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.provinceList[index].id
+      console.log(e);
+      const index = this.form.provinceList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.provinceList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(e) {
-      const index = this.form.cityList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.cityList[index].id
+      const index = this.form.cityList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.cityList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     handleAddBtn() {
-      const obj = {}
-      obj.brandName = ''
-      obj.categoryIds = ''
-      obj.productCode = ''
-      obj.productQuantity = ''
-      obj.productPrice = ''
-      this.addInfo.productList.push(obj)
-      this.showEdit[this.addInfo.productList.length-1] = true
-      this.isFirst[this.addInfo.productList.length - 1] = 1
-      C_list().then(res => {
-        console.log(res, '品类')
-        this.categoryList = res.data
-      })
-      SelectList().then(res => {
-        console.log(res, '品牌')
-        this.brandList = res
-      })
+      if (
+        this.showEdit[this.addInfo.productList.length - 1] === false ||
+        this.addInfo.productList.length === 0
+      ) {
+        const obj = {};
+        obj.brandName = "";
+        obj.categoryIds = "";
+        obj.productCode = "";
+        obj.productQuantity = "";
+        obj.productPrice = "";
+        obj.productName = "";
+        this.addInfo.productList.push(obj);
+        this.showEdit[this.addInfo.productList.length - 1] = true;
+        this.isFirst[this.addInfo.productList.length - 1] = 1;
+        C_list().then((res) => {
+          this.categoryList = res.data;
+        });
+        SelectList().then((res) => {
+          this.brandList = res;
+        });
+      } else {
+        this.$message.warning("请先保存上一次");
+      }
     },
     showUpdate(index, row) {
-      this.showEdit[index] = true
-      this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
-      this.brandName = row.brandName
-      this.categoryIds = row.categoryIds
-      this.addInfo.productList.productCode = row.productCode
-      this.addInfo.productList.productQuantity = row.productQuantity
-      this.addInfo.productList.productPrice = row.productPrice
+      this.showEdit[index] = true;
+      this.$set(this.showEdit, index, true); // 这里要用$set方法，否则页面状态不更新
+      this.brandName = row.brandName;
+      this.categoryIds = row.categoryIds;
+      this.addInfo.productList.productCode = row.productCode;
+      this.addInfo.productList.productQuantity = row.productQuantity;
+      this.addInfo.productList.productPrice = row.productPrice;
+      this.addInfo.productList.productName = row.productName;
     },
-    showDelete(index, row){
-      this.$confirm('确认删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    showDelete(index, row) {
+      this.$confirm("确认删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.addInfo.productList = this.addInfo.productList.filter((item,Index) => index!==Index)
-          this.showEdit = this.showEdit.filter((item,Index) => index!==Index)
-          this.isFirst = this.isFirst.filter((item,Index) => index!==Index)
+          this.addInfo.productList = this.addInfo.productList.filter(
+            (item, Index) => index !== Index
+          );
+          this.showEdit = this.showEdit.filter(
+            (item, Index) => index !== Index
+          );
+          this.isFirst = this.isFirst.filter((item, Index) => index !== Index);
           this.$message({
-            message: '已删除',
-            type: 'success'
-          })
+            message: "已删除",
+            type: "success",
+          });
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
+      const index = this.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      const code = this.categoryList[index].id;
+      console.log(code);
+      list({ categoryId: code }).then((res) => {
+        console.log(res);
+        this.CodeList = res;
+        // this.addInfo.productList.productName =''
+        // this.addInfo.productList.productCode =''
+      });
     },
     cancelUpdate(index) {
-      this.$confirm('取消修改？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("取消修改？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.$set(this.showEdit, index, false)
+          this.$set(this.showEdit, index, false);
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     submit(index, row) {
       // 发送请求，隐藏输入框
-      const { productCode, brandName, categoryIds, addInfo: { productList: { productQuantity, productPrice } } } = this
-      if (categoryIds&& brandName  && productQuantity && productPrice) {
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
+      const {
+        brandName,
+        categoryIds,
+        addInfo: {
+          productList: { productQuantity, productPrice },
+        },
+      } = this;
+      if (categoryIds && brandName) {
+        if (productQuantity > 0 && productPrice > 0) {
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$message({
+            type: "success",
+            message: "已缓存，记得点击保存提交修改喔！",
+            duration: 888,
+            onClose: () => {
+              this.$set(this.showEdit, index, false); // vue添加属性的方法
+            },
+          });
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$set(this.isFirst, index, 2);
+          this.brandName = "";
+          this.categoryIds = "";
+          this.addInfo.productList.productCode = "";
+          this.addInfo.productList.productQuantity = "";
+          this.addInfo.productList.productPrice = "";
+          this.addInfo.productList.productName = "";
+        } else {
+          this.$message.error("单价或数量需大于等于1");
+        }
+      } else {
         this.$message({
-          type: 'success',
-          message: '已缓存，记得点击保存提交修改喔！',
-          duration: 888,
-          onClose: () => {
-            this.$set(this.showEdit, index, false) // vue添加属性的方法
-          }
-        })
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
-        this.$set(this.isFirst, index, 2)
-        this.brandName = ''
-        this.categoryIds = ''
-        this.addInfo.productList.productCode = ''
-        this.addInfo.productList.productQuantity = ''
-        this.addInfo.productList.productPrice = ''
-      } else{
-        this.$message({
-              message: "请先完整选择或填写信息",
-              type: "error",
-            });
+          message: "请先完整选择或填写信息",
+          type: "error",
+        });
       }
     },
     setData() {
       this.addInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
+      };
     },
     valiateForm() {
-      let arr = []
-      for(var item in this.addInfo) {
-        if(this.addInfo[item]){
-          arr.push(1)
-        }else{
-          arr.push(0)
+      let arr = [];
+      for (var item in this.addInfo) {
+        if (this.addInfo[item]) {
+          arr.push(1);
+        } else {
+          arr.push(0);
         }
       }
-      return arr.every(item => item === 1)
-    }
-  }
-}
+      return arr.every((item) => item === 1);
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -673,7 +814,6 @@
     .close {
       width: 100px;
     }
-
   }
 }
 </style>
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 6638e3b..c899612 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -30,7 +30,12 @@
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
     >
-      <el-table-column prop="index" width="100px" label="序号" />
+      <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="distributorCode" width="200px" label="经销商编号" />
       <el-table-column prop="distributorName" width="400px" label="经销商名称" />
       <el-table-column prop="companyNatureName" width="150px" label="单位性质" />
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index de08ec0..704a758 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -92,7 +92,12 @@
       style="width: 100%"
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="account" label="账号" />
       <el-table-column prop="province" label="省" />
       <el-table-column prop="city" label="市" />
@@ -176,9 +181,19 @@
     },
     reset() {
       this.selectInfo = {
-        recommendType: '',
-        recommendTitle: ''
+        account: '',
+        province: '',
+        city: '',
+        area: ''
       }
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((offset - 1) * 10)
+        })
+        this.tableData = res
+      })
+
     },
     Bdelete(row) {
       // console.log(row);
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index ae070d5..5cc02cf 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -55,6 +55,11 @@
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
       <el-table-column prop="date" label="序号" />
+      <!-- <el-table-column type="index" label="序号" > -->
+      <!-- <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column> -->
       <el-table-column prop="name" label="账号" />
       <el-table-column prop="address" label="用户名" />
       <el-table-column prop="address1" label="姓名" />
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index cc4041f..94f52ad 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -76,6 +76,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
+          @click="batchDelete"
         >
           删除
         </el-button>
@@ -91,9 +92,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      ref="multipleTable"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="messageCode" label="消息编号" />
       <el-table-column prop="messageTitle" label="消息标题" />
       <el-table-column prop="messageContent" label="消息内容" />
@@ -106,6 +113,7 @@
           <el-button
             type="text"
             size="small"
+            @click="remove(scope.row)"
           >
             删除
           </el-button>
@@ -127,7 +135,7 @@
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/move/message'
+import { listPage ,deleteBatch ,deleteInfo} from '../../api/move/message'
 export default { // 加入分页逻辑
   components: {
     MassageAddDialog,
@@ -184,6 +192,44 @@
       this.isShowAdd = true
       this.title = '消息推送编辑'
       this.$refs.addMessage.init(row)
+    },
+    // 批量删除
+    batchDelete(){
+      if(this.$refs.multipleTable.selection.length){
+        this.$confirm(`确认删除选中的这些数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+         //  得到选中行
+         const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            deleteBatch({ ids: ids }).then((res) => {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+              });
+              this.refresh();
+            });
+      }).catch(()=>{})
+      }else{
+        this.$message.error('请先选择需要删除的消息记录')
+      }
+    },
+    remove(row){
+      this.$confirm(`确认删除此项数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+        deleteInfo({id:row.id}).then(()=>{
+          this.$message.success('操作成功')
+          this.refresh();
+        })
+      }).catch(()=>{})
     }
   }
 }
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 0f26885..1c67bdb 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -35,7 +35,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="id" label="序号" />
+      <el-table-column type="index" label="序号" />
       <el-table-column prop="orderId" label="订单号" />
       <el-table-column prop="userName" label="下单人" />
       <el-table-column prop="userPhone" label="联系方式" />
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index ab6f457..514371a 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -403,11 +403,11 @@
     },
     valiateProduct() {
       // 验证产品列表
-      if (this.addInfo.productList.length) {
+      if (this.addInfo.productList.length && this.showEdit.every(item => item=== false)) {
         return true;
       } else {
         this.$message({
-          message: "产品列表不能为空",
+          message: "请先添加或保存产品信息",
           type: "error",
         });
         return false;
@@ -478,6 +478,7 @@
           }
         })
         row.productCode = this.addInfo.productList.productCode
+        
         row.brandName = this.brandName
         row.categoryIds = this.categoryIds
         row.productQuantity = this.addInfo.productList.productQuantity
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 2dfc80a..652300f 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -91,6 +91,11 @@
     >
       <el-table-column type="selection" width="55" />
       <!--      <el-table-column prop="index" width="75" label="序号" />-->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -284,7 +289,16 @@
       })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows)
+          res.rows = res.rows.map(item =>{
+            return{
+              编号:item.brandCode,
+              '名称':item.brandName,
+              性质:item.brandProperty,
+              品类:item.categoryStr,
+              供应商:item.supplierStr
+            }
+          })
+          outToExcel(res.rows,'品牌列表')
           loading.close() // 关闭加载动画
           this.$message({
             message: '导出成功',
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 8767f49..71ae178 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -82,7 +82,12 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" width="60" />
+      <!-- <el-table-column type="index" label="序号" width="60" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index e1e9818..feb9245 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -93,6 +93,16 @@
         type="selection"
         width="55"
       />
+      <!-- <el-table-column
+        type="index"
+        width="55"
+        label="编号"
+      /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column
         prop="snCode"
         label="SN码"
@@ -166,6 +176,7 @@
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
 import { SelectList } from '../../api/product/brand'
 import { exportFile } from '@/utils/exportutils'
+import { export_json_to_excel } from "../../utils/Export2Excel";
 export default {
   components: {
     DataInfoItem,
@@ -301,6 +312,46 @@
         fileName = fileName.replace(/-|:| /g, '')
         exportFile(blob, fileName)
       })
+      // d_listPage("offset=1", {}).then((res) => {
+      //   console.log(res.rows, "全部数据");
+        // 对数据进行加工
+        // res.rows = res.rows.map((item) => {
+        //   return {
+        //     产品名称: item.productName,
+        //     产品品牌: item.brandName,
+        //     产品型号: item.productCode,
+        //     产品品类: item.categoryStr,
+        //     产品颜色: item.productColor,
+        //     产品材质: item.productMaterialQuality,
+        //     产品状态: item.productStatus,
+        //     产品版本: item.productEdition,
+        //     规格: item.productPackageSize,
+        //     重量: item.productWeight,
+        //     国际69码: item.internationalCode,
+        //     更新时间: item.updateTime,
+        //   };
+        // });
+      //   this.ExportTable = res.rows;
+      //   const header = Object.keys(res.rows[0]);
+      //   console.log(header);
+      //   const data = res.rows.map((user, index) => {
+      //     const userArr = [];
+      //     console.log(user, index);
+      //     for (const key in res.rows[0]) {
+      //       // console.log(res.rows[key]);
+      //       const item = user[key];
+      //       userArr.push(item);
+      //     }
+      //     return userArr;
+      //   });
+      //   console.log(data);
+      //   // //把定义好的header和data放进export_json_to_excel的函数里作为参数
+      //   export_json_to_excel({
+      //     header,
+      //     data,
+      //     filename: "设备列表",
+      //   });
+      // });
     }
   }
 }

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 4cae18a..25f5978 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -182,15 +182,16 @@
         temp.deliveryArea = this.AreaList[aindex].areaName;
         turnOrder(temp).then((res) => {
           this.$message.success("添加成功");
-          this.close();
+          this.$emit("close");
+          this.reset();
         });
-      }else {
-        console.log(this.valiatePhone())
-        if(this.valiatePhone() === false){
+      } else {
+        console.log(this.valiatePhone());
+        if (this.valiatePhone() === false) {
           this.$message.error("请检查手机号格式是否正确");
-        }else if(this.valiateProvince() === false){
+        } else if (this.valiateProvince() === false) {
           this.$message.error("请检查地址格式是否正确");
-        }else{
+        } else {
           this.$message.error("请正确填写信息");
         }
       }
diff --git a/src/components/mycomponent/groupPage.vue b/src/components/mycomponent/groupPage.vue
index 666edc1..372e253 100644
--- a/src/components/mycomponent/groupPage.vue
+++ b/src/components/mycomponent/groupPage.vue
@@ -1,7 +1,7 @@
 <!--分页组件-->
 <template>
   <div class="footer">
-    <div>共{{ total }}页记录 第{{ offset }}/{{ total }}页</div>
+    <div>共{{ count }}条记录 第{{ offset }}/{{ total }}页</div>
     <div>
       <el-pagination
         ref="compontentPage"
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index 4398baa..241cdd4 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -5,22 +5,48 @@
       <div class="productInput">
         项目名称
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemName" placeholder="请输入项目名称" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemName"
+            placeholder="请输入项目名称"
+            clearable
+            class="product-input"
+          />
         </div>
         项目预算
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemBudget" placeholder="请输入项目预算" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemBudget"
+            placeholder="请输入项目预算"
+            clearable
+            class="product-input"
+          />
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
+          <el-date-picker
+            v-model="selectInfo.itemDuration"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择日期"
+            class="product-input"
+          />
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
       </div>
@@ -39,14 +65,31 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
       <el-table-column prop="itemBudget" label="项目预算" />
-      <el-table-column prop="itemDuration" label="预计工期" />
+      <el-table-column prop="itemDuration" label="预计工期" >
+        <template slot-scope="{row}">
+          <span>
+           {{row.itemDuration.split(' ')[0]}}
+          </span>
+        </template>
+    </el-table-column>
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
+      <el-table-column label="项目地址">
+        <template slot-scope="{row}">
+          <span>
+            {{row.itemProvince === row.itemCity ? row.itemCity + row.itemArea  + row.itemAddress : row.itemProvince + row.itemCity + row.itemArea  + row.itemAddress}}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="handlerDetail(scope.row)">
@@ -66,64 +109,96 @@
     />
     <!-- xiangqing弹框 -->
 
-    <businessDetailDialog v-if="dialogFormVisible" :data-info="dataInfo" @close="detailClose" />
+    <businessDetailDialog
+      v-if="dialogFormVisible"
+      :data-info="dataInfo"
+      @close="detailClose"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import businessDetailDialog from '../../components/mycomponent/dialog/business/businessDetailDialog.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import businessDetailDialog from "../../components/mycomponent/dialog/business/businessDetailDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/business/business'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import { listPage } from "../../api/business/business";
+export default {
+  // 加入分页逻辑
   components: {
     GroupPage,
-    businessDetailDialog
+    businessDetailDialog,
   },
   mixins: [listMixin],
   data() {
     return {
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
       dialogFormVisible: false,
-      dataInfo: {}
-    }
+      dataInfo: {},
+    };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     tableRowClassName: tableRowClassName,
     detailClose() {
-      this.dialogFormVisible = false
+      this.dialogFormVisible = false;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     handlerDetail(row) {
-      console.log(row)
-      this.dialogFormVisible = true
-      this.dataInfo = row
-    }
-  }
-
-}
+      console.log(row);
+      this.dialogFormVisible = true;
+      this.dataInfo = row;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -184,11 +259,9 @@
     color: #6666;
     margin: 30px 10px;
   }
-
 }
 
 .order-dialog {
-
   .dialog-tab {
     .dialog-title {
       font-size: 16px;
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 7045eaf..e1c37c7 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -1,21 +1,29 @@
 <!--商机报备表单-->
 <template>
   <div class="report-container">
-    <div class="report-title">
-      基础报备
-    </div>
+    <div class="report-title">基础报备</div>
     <div class="report-from">
-      <div class="from-title">
-        基础信息
-      </div>
+      <div class="from-title">基础信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemName" title="项目名称" placeholder="请输入项目名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemName"
+            title="项目名称"
+            placeholder="请输入项目名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemBudget" title="项目预算" placeholder="请输入项目预算" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemBudget"
+            title="项目预算"
+            placeholder="请输入项目预算"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -25,7 +33,7 @@
               value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
-              style="width:380px"
+              style="width: 380px"
             />
           </inputVue>
         </div>
@@ -43,7 +51,13 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.phone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.phone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -60,8 +74,18 @@
         <div class="input-item">
           <RedStar />
           <inputVue title="商机状态" class="inputWidth">
-            <el-select v-model="addInfo.status" clearable placeholder="请选择" style="width:380px">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select
+              v-model="addInfo.status"
+              clearable
+              placeholder="请选择"
+              style="width: 380px"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </inputVue>
         </div>
@@ -72,10 +96,15 @@
               v-model="addInfo.itemProvince"
               clearable
               placeholder="省/市"
-              style="width:150px;margin-left: 55px;"
+              style="width: 150px; margin-left: 55px"
               @change="provinceChange"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -83,29 +112,53 @@
               v-model="addInfo.itemCity"
               clearable
               placeholder="市/区"
-              style="width:150px"
+              style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.itemArea" clearable placeholder="县/街道" style="width:150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+            <el-select
+              v-model="addInfo.itemArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.itemAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.itemAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        关联方信息
-      </div>
+      <div class="from-title">关联方信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.ownerName" title="业主方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.ownerName"
+            title="业主方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -131,7 +184,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.contractName" title="总包方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.contractName"
+            title="总包方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -189,7 +248,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.agentName" title="代理商名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.agentName"
+            title="代理商名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -214,19 +279,29 @@
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        产品信息
-      </div>
+      <div class="from-title">产品信息</div>
       <div class="from-table">
-        <div style="margin-left: 2px;">
-          <el-table ref="tb" :data="addInfo.productList" border class="el-tab" style="width: 100%;">
+        <div style="margin-left: 2px">
+          <el-table
+            ref="tb"
+            :data="addInfo.productList"
+            border
+            class="el-tab"
+            style="width: 100%"
+          >
             <el-table-column type="index" label="序号" width="50px" />
+            
             <el-table-column prop="brandName" label="产品品牌" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.brandName }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.brandName" placeholder="请输入产品品牌">
                 </el-input> -->
-                <el-select v-if="showEdit[$index]" v-model="brandName" clearable placeholder="请输入产品品牌">
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="brandName"
+                  clearable
+                  placeholder="请输入产品品牌"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.brandCode"
@@ -237,7 +312,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="categoryIds" label="产品品类" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.categoryIds }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.categoryIds" placeholder="请输入产品品类">
                 </el-input> -->
@@ -257,8 +332,26 @@
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column prop="productName" label="产品名称" width="200px">
+              <template slot-scope="{ row, $index }">
+                <span v-if="!showEdit[$index]">{{ row.productName }}</span>
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productName"
+                  clearable
+                  placeholder="请输入产品型号"
+                >
+                  <el-option
+                    v-for="item in CodeList"
+                    :key="item.id + 1"
+                    :label="item.productName"
+                    :value="item.productName"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="productCode" label="产品型号" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productCode }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productCode" placeholder="请输入产品型号">
                 </el-input> -->
@@ -277,38 +370,63 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="productQuantity" label="产品数量" width="200px">
-              <template slot-scope="{row,$index}">
+            <el-table-column
+              prop="productQuantity"
+              label="产品数量"
+              width="200px"
+            >
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productQuantity }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productQuantity" placeholder="请输入产品数量" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productQuantity"
+                  placeholder="请输入产品数量"
+                />
               </template>
             </el-table-column>
             <el-table-column prop="productPrice" label="产品单价" width="200px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productPrice }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productPrice" placeholder="请输入产品单价" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productPrice"
+                  placeholder="请输入产品单价"
+                />
               </template>
             </el-table-column>
-            <el-table-column header-align="center" align="center" width="200" label="操作">
-              <template slot-scope="{row,$index}">
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showUpdate($index, row)">
+            <el-table-column
+              header-align="center"
+              align="center"
+              width="200"
+              label="操作"
+            >
+              <template slot-scope="{ row, $index }">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showUpdate($index, row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showDelete($index, row)">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showDelete($index, row)"
+                >
                   删除
                 </el-button>
                 <el-button
                   v-if="showEdit[$index]"
                   size="small"
-                  style="color: #85ce61;"
+                  style="color: #85ce61"
                   @click="submit($index, row)"
                 >
                   确定
                 </el-button>
                 <el-button
-                  v-if="showEdit[$index] && isFirst[$index] >1"
+                  v-if="showEdit[$index] && isFirst[$index] > 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="cancelUpdate($index)"
                 >
                   取消
@@ -316,7 +434,7 @@
                 <el-button
                   v-if="showEdit[$index] && isFirst[$index] === 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="showDelete($index)"
                 >
                   删除
@@ -327,300 +445,323 @@
         </div>
       </div>
       <div>
-          <el-button class="table-btn" @click="handleAddBtn">
-            添加项目需求
-          </el-button>
-        </div>
+        <el-button class="table-btn" @click="handleAddBtn">
+          添加项目需求
+        </el-button>
+      </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+      <el-button type="info" class="close" @click="close"> 取消 </el-button>
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { list } from '../../api/product/product'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { add } from '../../api/business/business'
-import { order_area } from '../../api/order/order'
-import { Message } from 'element-ui'
+import { list } from "../../api/product/product";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { add } from "../../api/business/business";
+import { order_area } from "../../api/order/order";
+import { Message } from "element-ui";
 export default {
   components: {
-    RedStar, inputVue
+    RedStar,
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
+      brandName: "",
+      categoryIds: "",
       CodeList: [],
       brandList: [],
       categoryList: [],
       checkedDetail: [],
       showEdit: [], // 用来判断是否处于编辑状态
-      isFirst:[], // 用来判断是否初次添加
+      isFirst: [], // 用来判断是否初次添加
       options: [
-        { value: '0', label: '推进' },
-        { value: '1', label: '成交' },
-        { value: '2', label: '丢失' }
+        { value: "0", label: "推进" },
+        { value: "1", label: "成交" },
+        { value: "2", label: "丢失" },
       ],
       addInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
-      }
-    }
+        countyList: [],
+      },
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
+        console.log(newval, oldval);
         if (!this.addInfo.itemProvince) {
-          this.addInfo.itemCity = ''
-          this.addInfo.itemArea = ''
+          this.addInfo.itemCity = "";
+          this.addInfo.itemArea = "";
         } else if (!this.addInfo.itemCity) {
-          this.addInfo.itemArea = ''
+          this.addInfo.itemArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
   },
-  mounted() {
-
-  },
+  mounted() {},
   methods: {
     save() {
-      if(this.valiateForm()){
-        this.addInfo.productList = {
-        productCode: this.addInfo.productList.productCode,
-        productQuantity: this.addInfo.productList.productQuantity,
-        productPrice: this.addInfo.productList.productPrice,
-        productName: ''
-      }
-      add(this.addInfo).then(res => {
-        this.setData()
+      if (this.valiateForm()) {
+        //   this.addInfo.productList = {
+        //   productCode: this.addInfo.productList.productCode,
+        //   productQuantity: this.addInfo.productList.productQuantity,
+        //   productPrice: this.addInfo.productList.productPrice,
+        //   productName: ''
+        // }
+        if(this.addInfo.productList.length && this.showEdit.every(item => item=== false)){
+          add(this.addInfo).then((res) => {
+          this.setData();
           this.$message({
-            message: '保存成功',
-            type: 'success'
-          })
-      }) 
+            message: "保存成功",
+            type: "success",
+          });
+        });
+        }else{
+          this.$message.error('请先添加或保存产品信息')
+        }
       } else {
         this.$message({
-            message: '请先完整填写报备信息',
-            type: 'error'
-          })
+          message: "请先完整填写报备信息",
+          type: "error",
+        });
       }
-      
     },
     close() {
-      this.setData()
+      this.setData();
     },
     provinceChange(e) {
-      console.log(e)
-      const index = this.form.provinceList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.provinceList[index].id
+      console.log(e);
+      const index = this.form.provinceList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.provinceList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(e) {
-      const index = this.form.cityList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.cityList[index].id
+      const index = this.form.cityList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.cityList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     handleAddBtn() {
-      const obj = {}
-      obj.brandName = ''
-      obj.categoryIds = ''
-      obj.productCode = ''
-      obj.productQuantity = ''
-      obj.productPrice = ''
-      this.addInfo.productList.push(obj)
-      this.showEdit[this.addInfo.productList.length-1] = true
-      this.isFirst[this.addInfo.productList.length - 1] = 1
-      C_list().then(res => {
-        console.log(res, '品类')
-        this.categoryList = res.data
-      })
-      SelectList().then(res => {
-        console.log(res, '品牌')
-        this.brandList = res
-      })
+      if (
+        this.showEdit[this.addInfo.productList.length - 1] === false ||
+        this.addInfo.productList.length === 0
+      ) {
+        const obj = {};
+        obj.brandName = "";
+        obj.categoryIds = "";
+        obj.productCode = "";
+        obj.productQuantity = "";
+        obj.productPrice = "";
+        obj.productName = "";
+        this.addInfo.productList.push(obj);
+        this.showEdit[this.addInfo.productList.length - 1] = true;
+        this.isFirst[this.addInfo.productList.length - 1] = 1;
+        C_list().then((res) => {
+          this.categoryList = res.data;
+        });
+        SelectList().then((res) => {
+          this.brandList = res;
+        });
+      } else {
+        this.$message.warning("请先保存上一次");
+      }
     },
     showUpdate(index, row) {
-      this.showEdit[index] = true
-      this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
-      this.brandName = row.brandName
-      this.categoryIds = row.categoryIds
-      this.addInfo.productList.productCode = row.productCode
-      this.addInfo.productList.productQuantity = row.productQuantity
-      this.addInfo.productList.productPrice = row.productPrice
+      this.showEdit[index] = true;
+      this.$set(this.showEdit, index, true); // 这里要用$set方法，否则页面状态不更新
+      this.brandName = row.brandName;
+      this.categoryIds = row.categoryIds;
+      this.addInfo.productList.productCode = row.productCode;
+      this.addInfo.productList.productQuantity = row.productQuantity;
+      this.addInfo.productList.productPrice = row.productPrice;
+      this.addInfo.productList.productName = row.productName;
     },
-    showDelete(index, row){
-      this.$confirm('确认删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    showDelete(index, row) {
+      this.$confirm("确认删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.addInfo.productList = this.addInfo.productList.filter((item,Index) => index!==Index)
-          this.showEdit = this.showEdit.filter((item,Index) => index!==Index)
-          this.isFirst = this.isFirst.filter((item,Index) => index!==Index)
+          this.addInfo.productList = this.addInfo.productList.filter(
+            (item, Index) => index !== Index
+          );
+          this.showEdit = this.showEdit.filter(
+            (item, Index) => index !== Index
+          );
+          this.isFirst = this.isFirst.filter((item, Index) => index !== Index);
           this.$message({
-            message: '已删除',
-            type: 'success'
-          })
+            message: "已删除",
+            type: "success",
+          });
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
+      const index = this.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      const code = this.categoryList[index].id;
+      console.log(code);
+      list({ categoryId: code }).then((res) => {
+        console.log(res);
+        this.CodeList = res;
+        // this.addInfo.productList.productName =''
+        // this.addInfo.productList.productCode =''
+      });
     },
     cancelUpdate(index) {
-      this.$confirm('取消修改？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("取消修改？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.$set(this.showEdit, index, false)
+          this.$set(this.showEdit, index, false);
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     submit(index, row) {
       // 发送请求，隐藏输入框
-      const { productCode, brandName, categoryIds, addInfo: { productList: { productQuantity, productPrice } } } = this
-      if (categoryIds&& brandName  && productQuantity && productPrice) {
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
+      const {
+        brandName,
+        categoryIds,
+        addInfo: {
+          productList: { productQuantity, productPrice },
+        },
+      } = this;
+      if (categoryIds && brandName) {
+        if (productQuantity > 0 && productPrice > 0) {
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$message({
+            type: "success",
+            message: "已缓存，记得点击保存提交修改喔！",
+            duration: 888,
+            onClose: () => {
+              this.$set(this.showEdit, index, false); // vue添加属性的方法
+            },
+          });
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$set(this.isFirst, index, 2);
+          this.brandName = "";
+          this.categoryIds = "";
+          this.addInfo.productList.productCode = "";
+          this.addInfo.productList.productQuantity = "";
+          this.addInfo.productList.productPrice = "";
+          this.addInfo.productList.productName = "";
+        } else {
+          this.$message.error("单价或数量需大于等于1");
+        }
+      } else {
         this.$message({
-          type: 'success',
-          message: '已缓存，记得点击保存提交修改喔！',
-          duration: 888,
-          onClose: () => {
-            this.$set(this.showEdit, index, false) // vue添加属性的方法
-          }
-        })
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
-        this.$set(this.isFirst, index, 2)
-        this.brandName = ''
-        this.categoryIds = ''
-        this.addInfo.productList.productCode = ''
-        this.addInfo.productList.productQuantity = ''
-        this.addInfo.productList.productPrice = ''
-      } else{
-        this.$message({
-              message: "请先完整选择或填写信息",
-              type: "error",
-            });
+          message: "请先完整选择或填写信息",
+          type: "error",
+        });
       }
     },
     setData() {
       this.addInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
+      };
     },
     valiateForm() {
-      let arr = []
-      for(var item in this.addInfo) {
-        if(this.addInfo[item]){
-          arr.push(1)
-        }else{
-          arr.push(0)
+      let arr = [];
+      for (var item in this.addInfo) {
+        if (this.addInfo[item]) {
+          arr.push(1);
+        } else {
+          arr.push(0);
         }
       }
-      return arr.every(item => item === 1)
-    }
-  }
-}
+      return arr.every((item) => item === 1);
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -673,7 +814,6 @@
     .close {
       width: 100px;
     }
-
   }
 }
 </style>
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 6638e3b..c899612 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -30,7 +30,12 @@
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
     >
-      <el-table-column prop="index" width="100px" label="序号" />
+      <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="distributorCode" width="200px" label="经销商编号" />
       <el-table-column prop="distributorName" width="400px" label="经销商名称" />
       <el-table-column prop="companyNatureName" width="150px" label="单位性质" />
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index de08ec0..704a758 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -92,7 +92,12 @@
       style="width: 100%"
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="account" label="账号" />
       <el-table-column prop="province" label="省" />
       <el-table-column prop="city" label="市" />
@@ -176,9 +181,19 @@
     },
     reset() {
       this.selectInfo = {
-        recommendType: '',
-        recommendTitle: ''
+        account: '',
+        province: '',
+        city: '',
+        area: ''
       }
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((offset - 1) * 10)
+        })
+        this.tableData = res
+      })
+
     },
     Bdelete(row) {
       // console.log(row);
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index ae070d5..5cc02cf 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -55,6 +55,11 @@
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
       <el-table-column prop="date" label="序号" />
+      <!-- <el-table-column type="index" label="序号" > -->
+      <!-- <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column> -->
       <el-table-column prop="name" label="账号" />
       <el-table-column prop="address" label="用户名" />
       <el-table-column prop="address1" label="姓名" />
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index cc4041f..94f52ad 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -76,6 +76,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
+          @click="batchDelete"
         >
           删除
         </el-button>
@@ -91,9 +92,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      ref="multipleTable"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="messageCode" label="消息编号" />
       <el-table-column prop="messageTitle" label="消息标题" />
       <el-table-column prop="messageContent" label="消息内容" />
@@ -106,6 +113,7 @@
           <el-button
             type="text"
             size="small"
+            @click="remove(scope.row)"
           >
             删除
           </el-button>
@@ -127,7 +135,7 @@
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/move/message'
+import { listPage ,deleteBatch ,deleteInfo} from '../../api/move/message'
 export default { // 加入分页逻辑
   components: {
     MassageAddDialog,
@@ -184,6 +192,44 @@
       this.isShowAdd = true
       this.title = '消息推送编辑'
       this.$refs.addMessage.init(row)
+    },
+    // 批量删除
+    batchDelete(){
+      if(this.$refs.multipleTable.selection.length){
+        this.$confirm(`确认删除选中的这些数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+         //  得到选中行
+         const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            deleteBatch({ ids: ids }).then((res) => {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+              });
+              this.refresh();
+            });
+      }).catch(()=>{})
+      }else{
+        this.$message.error('请先选择需要删除的消息记录')
+      }
+    },
+    remove(row){
+      this.$confirm(`确认删除此项数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+        deleteInfo({id:row.id}).then(()=>{
+          this.$message.success('操作成功')
+          this.refresh();
+        })
+      }).catch(()=>{})
     }
   }
 }
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 0f26885..1c67bdb 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -35,7 +35,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="id" label="序号" />
+      <el-table-column type="index" label="序号" />
       <el-table-column prop="orderId" label="订单号" />
       <el-table-column prop="userName" label="下单人" />
       <el-table-column prop="userPhone" label="联系方式" />
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index ab6f457..514371a 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -403,11 +403,11 @@
     },
     valiateProduct() {
       // 验证产品列表
-      if (this.addInfo.productList.length) {
+      if (this.addInfo.productList.length && this.showEdit.every(item => item=== false)) {
         return true;
       } else {
         this.$message({
-          message: "产品列表不能为空",
+          message: "请先添加或保存产品信息",
           type: "error",
         });
         return false;
@@ -478,6 +478,7 @@
           }
         })
         row.productCode = this.addInfo.productList.productCode
+        
         row.brandName = this.brandName
         row.categoryIds = this.categoryIds
         row.productQuantity = this.addInfo.productList.productQuantity
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 2dfc80a..652300f 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -91,6 +91,11 @@
     >
       <el-table-column type="selection" width="55" />
       <!--      <el-table-column prop="index" width="75" label="序号" />-->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -284,7 +289,16 @@
       })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows)
+          res.rows = res.rows.map(item =>{
+            return{
+              编号:item.brandCode,
+              '名称':item.brandName,
+              性质:item.brandProperty,
+              品类:item.categoryStr,
+              供应商:item.supplierStr
+            }
+          })
+          outToExcel(res.rows,'品牌列表')
           loading.close() // 关闭加载动画
           this.$message({
             message: '导出成功',
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 8767f49..71ae178 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -82,7 +82,12 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" width="60" />
+      <!-- <el-table-column type="index" label="序号" width="60" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index e1e9818..feb9245 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -93,6 +93,16 @@
         type="selection"
         width="55"
       />
+      <!-- <el-table-column
+        type="index"
+        width="55"
+        label="编号"
+      /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column
         prop="snCode"
         label="SN码"
@@ -166,6 +176,7 @@
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
 import { SelectList } from '../../api/product/brand'
 import { exportFile } from '@/utils/exportutils'
+import { export_json_to_excel } from "../../utils/Export2Excel";
 export default {
   components: {
     DataInfoItem,
@@ -301,6 +312,46 @@
         fileName = fileName.replace(/-|:| /g, '')
         exportFile(blob, fileName)
       })
+      // d_listPage("offset=1", {}).then((res) => {
+      //   console.log(res.rows, "全部数据");
+        // 对数据进行加工
+        // res.rows = res.rows.map((item) => {
+        //   return {
+        //     产品名称: item.productName,
+        //     产品品牌: item.brandName,
+        //     产品型号: item.productCode,
+        //     产品品类: item.categoryStr,
+        //     产品颜色: item.productColor,
+        //     产品材质: item.productMaterialQuality,
+        //     产品状态: item.productStatus,
+        //     产品版本: item.productEdition,
+        //     规格: item.productPackageSize,
+        //     重量: item.productWeight,
+        //     国际69码: item.internationalCode,
+        //     更新时间: item.updateTime,
+        //   };
+        // });
+      //   this.ExportTable = res.rows;
+      //   const header = Object.keys(res.rows[0]);
+      //   console.log(header);
+      //   const data = res.rows.map((user, index) => {
+      //     const userArr = [];
+      //     console.log(user, index);
+      //     for (const key in res.rows[0]) {
+      //       // console.log(res.rows[key]);
+      //       const item = user[key];
+      //       userArr.push(item);
+      //     }
+      //     return userArr;
+      //   });
+      //   console.log(data);
+      //   // //把定义好的header和data放进export_json_to_excel的函数里作为参数
+      //   export_json_to_excel({
+      //     header,
+      //     data,
+      //     filename: "设备列表",
+      //   });
+      // });
     }
   }
 }
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index a84eeeb..f0bfbd1 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -73,8 +73,13 @@
         :header-cell-style="{ background: '#2483b3', color: 'white' }"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column type="index" label="编号" width="60" />
+        <!-- <el-table-column type="index" label="编号" width="60" /> -->
         <!--        <el-table-column header-align="center" align="center" prop="id" label="序号" />-->
+        <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
         <el-table-column
           header-align="center"
           align="center"

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 4cae18a..25f5978 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -182,15 +182,16 @@
         temp.deliveryArea = this.AreaList[aindex].areaName;
         turnOrder(temp).then((res) => {
           this.$message.success("添加成功");
-          this.close();
+          this.$emit("close");
+          this.reset();
         });
-      }else {
-        console.log(this.valiatePhone())
-        if(this.valiatePhone() === false){
+      } else {
+        console.log(this.valiatePhone());
+        if (this.valiatePhone() === false) {
           this.$message.error("请检查手机号格式是否正确");
-        }else if(this.valiateProvince() === false){
+        } else if (this.valiateProvince() === false) {
           this.$message.error("请检查地址格式是否正确");
-        }else{
+        } else {
           this.$message.error("请正确填写信息");
         }
       }
diff --git a/src/components/mycomponent/groupPage.vue b/src/components/mycomponent/groupPage.vue
index 666edc1..372e253 100644
--- a/src/components/mycomponent/groupPage.vue
+++ b/src/components/mycomponent/groupPage.vue
@@ -1,7 +1,7 @@
 <!--分页组件-->
 <template>
   <div class="footer">
-    <div>共{{ total }}页记录 第{{ offset }}/{{ total }}页</div>
+    <div>共{{ count }}条记录 第{{ offset }}/{{ total }}页</div>
     <div>
       <el-pagination
         ref="compontentPage"
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index 4398baa..241cdd4 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -5,22 +5,48 @@
       <div class="productInput">
         项目名称
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemName" placeholder="请输入项目名称" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemName"
+            placeholder="请输入项目名称"
+            clearable
+            class="product-input"
+          />
         </div>
         项目预算
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemBudget" placeholder="请输入项目预算" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemBudget"
+            placeholder="请输入项目预算"
+            clearable
+            class="product-input"
+          />
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
+          <el-date-picker
+            v-model="selectInfo.itemDuration"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择日期"
+            class="product-input"
+          />
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
       </div>
@@ -39,14 +65,31 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
       <el-table-column prop="itemBudget" label="项目预算" />
-      <el-table-column prop="itemDuration" label="预计工期" />
+      <el-table-column prop="itemDuration" label="预计工期" >
+        <template slot-scope="{row}">
+          <span>
+           {{row.itemDuration.split(' ')[0]}}
+          </span>
+        </template>
+    </el-table-column>
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
+      <el-table-column label="项目地址">
+        <template slot-scope="{row}">
+          <span>
+            {{row.itemProvince === row.itemCity ? row.itemCity + row.itemArea  + row.itemAddress : row.itemProvince + row.itemCity + row.itemArea  + row.itemAddress}}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="handlerDetail(scope.row)">
@@ -66,64 +109,96 @@
     />
     <!-- xiangqing弹框 -->
 
-    <businessDetailDialog v-if="dialogFormVisible" :data-info="dataInfo" @close="detailClose" />
+    <businessDetailDialog
+      v-if="dialogFormVisible"
+      :data-info="dataInfo"
+      @close="detailClose"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import businessDetailDialog from '../../components/mycomponent/dialog/business/businessDetailDialog.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import businessDetailDialog from "../../components/mycomponent/dialog/business/businessDetailDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/business/business'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import { listPage } from "../../api/business/business";
+export default {
+  // 加入分页逻辑
   components: {
     GroupPage,
-    businessDetailDialog
+    businessDetailDialog,
   },
   mixins: [listMixin],
   data() {
     return {
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
       dialogFormVisible: false,
-      dataInfo: {}
-    }
+      dataInfo: {},
+    };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     tableRowClassName: tableRowClassName,
     detailClose() {
-      this.dialogFormVisible = false
+      this.dialogFormVisible = false;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     handlerDetail(row) {
-      console.log(row)
-      this.dialogFormVisible = true
-      this.dataInfo = row
-    }
-  }
-
-}
+      console.log(row);
+      this.dialogFormVisible = true;
+      this.dataInfo = row;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -184,11 +259,9 @@
     color: #6666;
     margin: 30px 10px;
   }
-
 }
 
 .order-dialog {
-
   .dialog-tab {
     .dialog-title {
       font-size: 16px;
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 7045eaf..e1c37c7 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -1,21 +1,29 @@
 <!--商机报备表单-->
 <template>
   <div class="report-container">
-    <div class="report-title">
-      基础报备
-    </div>
+    <div class="report-title">基础报备</div>
     <div class="report-from">
-      <div class="from-title">
-        基础信息
-      </div>
+      <div class="from-title">基础信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemName" title="项目名称" placeholder="请输入项目名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemName"
+            title="项目名称"
+            placeholder="请输入项目名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemBudget" title="项目预算" placeholder="请输入项目预算" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemBudget"
+            title="项目预算"
+            placeholder="请输入项目预算"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -25,7 +33,7 @@
               value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
-              style="width:380px"
+              style="width: 380px"
             />
           </inputVue>
         </div>
@@ -43,7 +51,13 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.phone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.phone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -60,8 +74,18 @@
         <div class="input-item">
           <RedStar />
           <inputVue title="商机状态" class="inputWidth">
-            <el-select v-model="addInfo.status" clearable placeholder="请选择" style="width:380px">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select
+              v-model="addInfo.status"
+              clearable
+              placeholder="请选择"
+              style="width: 380px"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </inputVue>
         </div>
@@ -72,10 +96,15 @@
               v-model="addInfo.itemProvince"
               clearable
               placeholder="省/市"
-              style="width:150px;margin-left: 55px;"
+              style="width: 150px; margin-left: 55px"
               @change="provinceChange"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -83,29 +112,53 @@
               v-model="addInfo.itemCity"
               clearable
               placeholder="市/区"
-              style="width:150px"
+              style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.itemArea" clearable placeholder="县/街道" style="width:150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+            <el-select
+              v-model="addInfo.itemArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.itemAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.itemAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        关联方信息
-      </div>
+      <div class="from-title">关联方信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.ownerName" title="业主方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.ownerName"
+            title="业主方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -131,7 +184,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.contractName" title="总包方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.contractName"
+            title="总包方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -189,7 +248,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.agentName" title="代理商名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.agentName"
+            title="代理商名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -214,19 +279,29 @@
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        产品信息
-      </div>
+      <div class="from-title">产品信息</div>
       <div class="from-table">
-        <div style="margin-left: 2px;">
-          <el-table ref="tb" :data="addInfo.productList" border class="el-tab" style="width: 100%;">
+        <div style="margin-left: 2px">
+          <el-table
+            ref="tb"
+            :data="addInfo.productList"
+            border
+            class="el-tab"
+            style="width: 100%"
+          >
             <el-table-column type="index" label="序号" width="50px" />
+            
             <el-table-column prop="brandName" label="产品品牌" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.brandName }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.brandName" placeholder="请输入产品品牌">
                 </el-input> -->
-                <el-select v-if="showEdit[$index]" v-model="brandName" clearable placeholder="请输入产品品牌">
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="brandName"
+                  clearable
+                  placeholder="请输入产品品牌"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.brandCode"
@@ -237,7 +312,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="categoryIds" label="产品品类" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.categoryIds }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.categoryIds" placeholder="请输入产品品类">
                 </el-input> -->
@@ -257,8 +332,26 @@
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column prop="productName" label="产品名称" width="200px">
+              <template slot-scope="{ row, $index }">
+                <span v-if="!showEdit[$index]">{{ row.productName }}</span>
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productName"
+                  clearable
+                  placeholder="请输入产品型号"
+                >
+                  <el-option
+                    v-for="item in CodeList"
+                    :key="item.id + 1"
+                    :label="item.productName"
+                    :value="item.productName"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="productCode" label="产品型号" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productCode }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productCode" placeholder="请输入产品型号">
                 </el-input> -->
@@ -277,38 +370,63 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="productQuantity" label="产品数量" width="200px">
-              <template slot-scope="{row,$index}">
+            <el-table-column
+              prop="productQuantity"
+              label="产品数量"
+              width="200px"
+            >
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productQuantity }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productQuantity" placeholder="请输入产品数量" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productQuantity"
+                  placeholder="请输入产品数量"
+                />
               </template>
             </el-table-column>
             <el-table-column prop="productPrice" label="产品单价" width="200px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productPrice }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productPrice" placeholder="请输入产品单价" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productPrice"
+                  placeholder="请输入产品单价"
+                />
               </template>
             </el-table-column>
-            <el-table-column header-align="center" align="center" width="200" label="操作">
-              <template slot-scope="{row,$index}">
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showUpdate($index, row)">
+            <el-table-column
+              header-align="center"
+              align="center"
+              width="200"
+              label="操作"
+            >
+              <template slot-scope="{ row, $index }">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showUpdate($index, row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showDelete($index, row)">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showDelete($index, row)"
+                >
                   删除
                 </el-button>
                 <el-button
                   v-if="showEdit[$index]"
                   size="small"
-                  style="color: #85ce61;"
+                  style="color: #85ce61"
                   @click="submit($index, row)"
                 >
                   确定
                 </el-button>
                 <el-button
-                  v-if="showEdit[$index] && isFirst[$index] >1"
+                  v-if="showEdit[$index] && isFirst[$index] > 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="cancelUpdate($index)"
                 >
                   取消
@@ -316,7 +434,7 @@
                 <el-button
                   v-if="showEdit[$index] && isFirst[$index] === 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="showDelete($index)"
                 >
                   删除
@@ -327,300 +445,323 @@
         </div>
       </div>
       <div>
-          <el-button class="table-btn" @click="handleAddBtn">
-            添加项目需求
-          </el-button>
-        </div>
+        <el-button class="table-btn" @click="handleAddBtn">
+          添加项目需求
+        </el-button>
+      </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+      <el-button type="info" class="close" @click="close"> 取消 </el-button>
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { list } from '../../api/product/product'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { add } from '../../api/business/business'
-import { order_area } from '../../api/order/order'
-import { Message } from 'element-ui'
+import { list } from "../../api/product/product";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { add } from "../../api/business/business";
+import { order_area } from "../../api/order/order";
+import { Message } from "element-ui";
 export default {
   components: {
-    RedStar, inputVue
+    RedStar,
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
+      brandName: "",
+      categoryIds: "",
       CodeList: [],
       brandList: [],
       categoryList: [],
       checkedDetail: [],
       showEdit: [], // 用来判断是否处于编辑状态
-      isFirst:[], // 用来判断是否初次添加
+      isFirst: [], // 用来判断是否初次添加
       options: [
-        { value: '0', label: '推进' },
-        { value: '1', label: '成交' },
-        { value: '2', label: '丢失' }
+        { value: "0", label: "推进" },
+        { value: "1", label: "成交" },
+        { value: "2", label: "丢失" },
       ],
       addInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
-      }
-    }
+        countyList: [],
+      },
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
+        console.log(newval, oldval);
         if (!this.addInfo.itemProvince) {
-          this.addInfo.itemCity = ''
-          this.addInfo.itemArea = ''
+          this.addInfo.itemCity = "";
+          this.addInfo.itemArea = "";
         } else if (!this.addInfo.itemCity) {
-          this.addInfo.itemArea = ''
+          this.addInfo.itemArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
   },
-  mounted() {
-
-  },
+  mounted() {},
   methods: {
     save() {
-      if(this.valiateForm()){
-        this.addInfo.productList = {
-        productCode: this.addInfo.productList.productCode,
-        productQuantity: this.addInfo.productList.productQuantity,
-        productPrice: this.addInfo.productList.productPrice,
-        productName: ''
-      }
-      add(this.addInfo).then(res => {
-        this.setData()
+      if (this.valiateForm()) {
+        //   this.addInfo.productList = {
+        //   productCode: this.addInfo.productList.productCode,
+        //   productQuantity: this.addInfo.productList.productQuantity,
+        //   productPrice: this.addInfo.productList.productPrice,
+        //   productName: ''
+        // }
+        if(this.addInfo.productList.length && this.showEdit.every(item => item=== false)){
+          add(this.addInfo).then((res) => {
+          this.setData();
           this.$message({
-            message: '保存成功',
-            type: 'success'
-          })
-      }) 
+            message: "保存成功",
+            type: "success",
+          });
+        });
+        }else{
+          this.$message.error('请先添加或保存产品信息')
+        }
       } else {
         this.$message({
-            message: '请先完整填写报备信息',
-            type: 'error'
-          })
+          message: "请先完整填写报备信息",
+          type: "error",
+        });
       }
-      
     },
     close() {
-      this.setData()
+      this.setData();
     },
     provinceChange(e) {
-      console.log(e)
-      const index = this.form.provinceList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.provinceList[index].id
+      console.log(e);
+      const index = this.form.provinceList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.provinceList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(e) {
-      const index = this.form.cityList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.cityList[index].id
+      const index = this.form.cityList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.cityList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     handleAddBtn() {
-      const obj = {}
-      obj.brandName = ''
-      obj.categoryIds = ''
-      obj.productCode = ''
-      obj.productQuantity = ''
-      obj.productPrice = ''
-      this.addInfo.productList.push(obj)
-      this.showEdit[this.addInfo.productList.length-1] = true
-      this.isFirst[this.addInfo.productList.length - 1] = 1
-      C_list().then(res => {
-        console.log(res, '品类')
-        this.categoryList = res.data
-      })
-      SelectList().then(res => {
-        console.log(res, '品牌')
-        this.brandList = res
-      })
+      if (
+        this.showEdit[this.addInfo.productList.length - 1] === false ||
+        this.addInfo.productList.length === 0
+      ) {
+        const obj = {};
+        obj.brandName = "";
+        obj.categoryIds = "";
+        obj.productCode = "";
+        obj.productQuantity = "";
+        obj.productPrice = "";
+        obj.productName = "";
+        this.addInfo.productList.push(obj);
+        this.showEdit[this.addInfo.productList.length - 1] = true;
+        this.isFirst[this.addInfo.productList.length - 1] = 1;
+        C_list().then((res) => {
+          this.categoryList = res.data;
+        });
+        SelectList().then((res) => {
+          this.brandList = res;
+        });
+      } else {
+        this.$message.warning("请先保存上一次");
+      }
     },
     showUpdate(index, row) {
-      this.showEdit[index] = true
-      this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
-      this.brandName = row.brandName
-      this.categoryIds = row.categoryIds
-      this.addInfo.productList.productCode = row.productCode
-      this.addInfo.productList.productQuantity = row.productQuantity
-      this.addInfo.productList.productPrice = row.productPrice
+      this.showEdit[index] = true;
+      this.$set(this.showEdit, index, true); // 这里要用$set方法，否则页面状态不更新
+      this.brandName = row.brandName;
+      this.categoryIds = row.categoryIds;
+      this.addInfo.productList.productCode = row.productCode;
+      this.addInfo.productList.productQuantity = row.productQuantity;
+      this.addInfo.productList.productPrice = row.productPrice;
+      this.addInfo.productList.productName = row.productName;
     },
-    showDelete(index, row){
-      this.$confirm('确认删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    showDelete(index, row) {
+      this.$confirm("确认删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.addInfo.productList = this.addInfo.productList.filter((item,Index) => index!==Index)
-          this.showEdit = this.showEdit.filter((item,Index) => index!==Index)
-          this.isFirst = this.isFirst.filter((item,Index) => index!==Index)
+          this.addInfo.productList = this.addInfo.productList.filter(
+            (item, Index) => index !== Index
+          );
+          this.showEdit = this.showEdit.filter(
+            (item, Index) => index !== Index
+          );
+          this.isFirst = this.isFirst.filter((item, Index) => index !== Index);
           this.$message({
-            message: '已删除',
-            type: 'success'
-          })
+            message: "已删除",
+            type: "success",
+          });
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
+      const index = this.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      const code = this.categoryList[index].id;
+      console.log(code);
+      list({ categoryId: code }).then((res) => {
+        console.log(res);
+        this.CodeList = res;
+        // this.addInfo.productList.productName =''
+        // this.addInfo.productList.productCode =''
+      });
     },
     cancelUpdate(index) {
-      this.$confirm('取消修改？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("取消修改？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.$set(this.showEdit, index, false)
+          this.$set(this.showEdit, index, false);
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     submit(index, row) {
       // 发送请求，隐藏输入框
-      const { productCode, brandName, categoryIds, addInfo: { productList: { productQuantity, productPrice } } } = this
-      if (categoryIds&& brandName  && productQuantity && productPrice) {
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
+      const {
+        brandName,
+        categoryIds,
+        addInfo: {
+          productList: { productQuantity, productPrice },
+        },
+      } = this;
+      if (categoryIds && brandName) {
+        if (productQuantity > 0 && productPrice > 0) {
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$message({
+            type: "success",
+            message: "已缓存，记得点击保存提交修改喔！",
+            duration: 888,
+            onClose: () => {
+              this.$set(this.showEdit, index, false); // vue添加属性的方法
+            },
+          });
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$set(this.isFirst, index, 2);
+          this.brandName = "";
+          this.categoryIds = "";
+          this.addInfo.productList.productCode = "";
+          this.addInfo.productList.productQuantity = "";
+          this.addInfo.productList.productPrice = "";
+          this.addInfo.productList.productName = "";
+        } else {
+          this.$message.error("单价或数量需大于等于1");
+        }
+      } else {
         this.$message({
-          type: 'success',
-          message: '已缓存，记得点击保存提交修改喔！',
-          duration: 888,
-          onClose: () => {
-            this.$set(this.showEdit, index, false) // vue添加属性的方法
-          }
-        })
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
-        this.$set(this.isFirst, index, 2)
-        this.brandName = ''
-        this.categoryIds = ''
-        this.addInfo.productList.productCode = ''
-        this.addInfo.productList.productQuantity = ''
-        this.addInfo.productList.productPrice = ''
-      } else{
-        this.$message({
-              message: "请先完整选择或填写信息",
-              type: "error",
-            });
+          message: "请先完整选择或填写信息",
+          type: "error",
+        });
       }
     },
     setData() {
       this.addInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
+      };
     },
     valiateForm() {
-      let arr = []
-      for(var item in this.addInfo) {
-        if(this.addInfo[item]){
-          arr.push(1)
-        }else{
-          arr.push(0)
+      let arr = [];
+      for (var item in this.addInfo) {
+        if (this.addInfo[item]) {
+          arr.push(1);
+        } else {
+          arr.push(0);
         }
       }
-      return arr.every(item => item === 1)
-    }
-  }
-}
+      return arr.every((item) => item === 1);
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -673,7 +814,6 @@
     .close {
       width: 100px;
     }
-
   }
 }
 </style>
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 6638e3b..c899612 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -30,7 +30,12 @@
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
     >
-      <el-table-column prop="index" width="100px" label="序号" />
+      <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="distributorCode" width="200px" label="经销商编号" />
       <el-table-column prop="distributorName" width="400px" label="经销商名称" />
       <el-table-column prop="companyNatureName" width="150px" label="单位性质" />
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index de08ec0..704a758 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -92,7 +92,12 @@
       style="width: 100%"
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="account" label="账号" />
       <el-table-column prop="province" label="省" />
       <el-table-column prop="city" label="市" />
@@ -176,9 +181,19 @@
     },
     reset() {
       this.selectInfo = {
-        recommendType: '',
-        recommendTitle: ''
+        account: '',
+        province: '',
+        city: '',
+        area: ''
       }
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((offset - 1) * 10)
+        })
+        this.tableData = res
+      })
+
     },
     Bdelete(row) {
       // console.log(row);
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index ae070d5..5cc02cf 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -55,6 +55,11 @@
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
       <el-table-column prop="date" label="序号" />
+      <!-- <el-table-column type="index" label="序号" > -->
+      <!-- <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column> -->
       <el-table-column prop="name" label="账号" />
       <el-table-column prop="address" label="用户名" />
       <el-table-column prop="address1" label="姓名" />
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index cc4041f..94f52ad 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -76,6 +76,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
+          @click="batchDelete"
         >
           删除
         </el-button>
@@ -91,9 +92,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      ref="multipleTable"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="messageCode" label="消息编号" />
       <el-table-column prop="messageTitle" label="消息标题" />
       <el-table-column prop="messageContent" label="消息内容" />
@@ -106,6 +113,7 @@
           <el-button
             type="text"
             size="small"
+            @click="remove(scope.row)"
           >
             删除
           </el-button>
@@ -127,7 +135,7 @@
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/move/message'
+import { listPage ,deleteBatch ,deleteInfo} from '../../api/move/message'
 export default { // 加入分页逻辑
   components: {
     MassageAddDialog,
@@ -184,6 +192,44 @@
       this.isShowAdd = true
       this.title = '消息推送编辑'
       this.$refs.addMessage.init(row)
+    },
+    // 批量删除
+    batchDelete(){
+      if(this.$refs.multipleTable.selection.length){
+        this.$confirm(`确认删除选中的这些数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+         //  得到选中行
+         const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            deleteBatch({ ids: ids }).then((res) => {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+              });
+              this.refresh();
+            });
+      }).catch(()=>{})
+      }else{
+        this.$message.error('请先选择需要删除的消息记录')
+      }
+    },
+    remove(row){
+      this.$confirm(`确认删除此项数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+        deleteInfo({id:row.id}).then(()=>{
+          this.$message.success('操作成功')
+          this.refresh();
+        })
+      }).catch(()=>{})
     }
   }
 }
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 0f26885..1c67bdb 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -35,7 +35,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="id" label="序号" />
+      <el-table-column type="index" label="序号" />
       <el-table-column prop="orderId" label="订单号" />
       <el-table-column prop="userName" label="下单人" />
       <el-table-column prop="userPhone" label="联系方式" />
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index ab6f457..514371a 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -403,11 +403,11 @@
     },
     valiateProduct() {
       // 验证产品列表
-      if (this.addInfo.productList.length) {
+      if (this.addInfo.productList.length && this.showEdit.every(item => item=== false)) {
         return true;
       } else {
         this.$message({
-          message: "产品列表不能为空",
+          message: "请先添加或保存产品信息",
           type: "error",
         });
         return false;
@@ -478,6 +478,7 @@
           }
         })
         row.productCode = this.addInfo.productList.productCode
+        
         row.brandName = this.brandName
         row.categoryIds = this.categoryIds
         row.productQuantity = this.addInfo.productList.productQuantity
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 2dfc80a..652300f 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -91,6 +91,11 @@
     >
       <el-table-column type="selection" width="55" />
       <!--      <el-table-column prop="index" width="75" label="序号" />-->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -284,7 +289,16 @@
       })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows)
+          res.rows = res.rows.map(item =>{
+            return{
+              编号:item.brandCode,
+              '名称':item.brandName,
+              性质:item.brandProperty,
+              品类:item.categoryStr,
+              供应商:item.supplierStr
+            }
+          })
+          outToExcel(res.rows,'品牌列表')
           loading.close() // 关闭加载动画
           this.$message({
             message: '导出成功',
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 8767f49..71ae178 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -82,7 +82,12 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" width="60" />
+      <!-- <el-table-column type="index" label="序号" width="60" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index e1e9818..feb9245 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -93,6 +93,16 @@
         type="selection"
         width="55"
       />
+      <!-- <el-table-column
+        type="index"
+        width="55"
+        label="编号"
+      /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column
         prop="snCode"
         label="SN码"
@@ -166,6 +176,7 @@
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
 import { SelectList } from '../../api/product/brand'
 import { exportFile } from '@/utils/exportutils'
+import { export_json_to_excel } from "../../utils/Export2Excel";
 export default {
   components: {
     DataInfoItem,
@@ -301,6 +312,46 @@
         fileName = fileName.replace(/-|:| /g, '')
         exportFile(blob, fileName)
       })
+      // d_listPage("offset=1", {}).then((res) => {
+      //   console.log(res.rows, "全部数据");
+        // 对数据进行加工
+        // res.rows = res.rows.map((item) => {
+        //   return {
+        //     产品名称: item.productName,
+        //     产品品牌: item.brandName,
+        //     产品型号: item.productCode,
+        //     产品品类: item.categoryStr,
+        //     产品颜色: item.productColor,
+        //     产品材质: item.productMaterialQuality,
+        //     产品状态: item.productStatus,
+        //     产品版本: item.productEdition,
+        //     规格: item.productPackageSize,
+        //     重量: item.productWeight,
+        //     国际69码: item.internationalCode,
+        //     更新时间: item.updateTime,
+        //   };
+        // });
+      //   this.ExportTable = res.rows;
+      //   const header = Object.keys(res.rows[0]);
+      //   console.log(header);
+      //   const data = res.rows.map((user, index) => {
+      //     const userArr = [];
+      //     console.log(user, index);
+      //     for (const key in res.rows[0]) {
+      //       // console.log(res.rows[key]);
+      //       const item = user[key];
+      //       userArr.push(item);
+      //     }
+      //     return userArr;
+      //   });
+      //   console.log(data);
+      //   // //把定义好的header和data放进export_json_to_excel的函数里作为参数
+      //   export_json_to_excel({
+      //     header,
+      //     data,
+      //     filename: "设备列表",
+      //   });
+      // });
     }
   }
 }
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index a84eeeb..f0bfbd1 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -73,8 +73,13 @@
         :header-cell-style="{ background: '#2483b3', color: 'white' }"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column type="index" label="编号" width="60" />
+        <!-- <el-table-column type="index" label="编号" width="60" /> -->
         <!--        <el-table-column header-align="center" align="center" prop="id" label="序号" />-->
+        <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
         <el-table-column
           header-align="center"
           align="center"
diff --git a/src/views/product/snCodeField.vue b/src/views/product/snCodeField.vue
index 14d8f18..8edeb97 100644
--- a/src/views/product/snCodeField.vue
+++ b/src/views/product/snCodeField.vue
@@ -80,6 +80,11 @@
     >
       <el-table-column type="selection" width="55" />
       <!--      <el-table-column prop="index" label="序号" />-->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="snFixedId" label="SN码（固定标识）" />
       <el-table-column prop="snFixedIllustration" label="SN码（固定标识）说明" />
       <el-table-column prop="snStartCode" label="SN码（起始序列号）" />

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 4cae18a..25f5978 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -182,15 +182,16 @@
         temp.deliveryArea = this.AreaList[aindex].areaName;
         turnOrder(temp).then((res) => {
           this.$message.success("添加成功");
-          this.close();
+          this.$emit("close");
+          this.reset();
         });
-      }else {
-        console.log(this.valiatePhone())
-        if(this.valiatePhone() === false){
+      } else {
+        console.log(this.valiatePhone());
+        if (this.valiatePhone() === false) {
           this.$message.error("请检查手机号格式是否正确");
-        }else if(this.valiateProvince() === false){
+        } else if (this.valiateProvince() === false) {
           this.$message.error("请检查地址格式是否正确");
-        }else{
+        } else {
           this.$message.error("请正确填写信息");
         }
       }
diff --git a/src/components/mycomponent/groupPage.vue b/src/components/mycomponent/groupPage.vue
index 666edc1..372e253 100644
--- a/src/components/mycomponent/groupPage.vue
+++ b/src/components/mycomponent/groupPage.vue
@@ -1,7 +1,7 @@
 <!--分页组件-->
 <template>
   <div class="footer">
-    <div>共{{ total }}页记录 第{{ offset }}/{{ total }}页</div>
+    <div>共{{ count }}条记录 第{{ offset }}/{{ total }}页</div>
     <div>
       <el-pagination
         ref="compontentPage"
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index 4398baa..241cdd4 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -5,22 +5,48 @@
       <div class="productInput">
         项目名称
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemName" placeholder="请输入项目名称" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemName"
+            placeholder="请输入项目名称"
+            clearable
+            class="product-input"
+          />
         </div>
         项目预算
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemBudget" placeholder="请输入项目预算" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemBudget"
+            placeholder="请输入项目预算"
+            clearable
+            class="product-input"
+          />
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
+          <el-date-picker
+            v-model="selectInfo.itemDuration"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择日期"
+            class="product-input"
+          />
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
       </div>
@@ -39,14 +65,31 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
       <el-table-column prop="itemBudget" label="项目预算" />
-      <el-table-column prop="itemDuration" label="预计工期" />
+      <el-table-column prop="itemDuration" label="预计工期" >
+        <template slot-scope="{row}">
+          <span>
+           {{row.itemDuration.split(' ')[0]}}
+          </span>
+        </template>
+    </el-table-column>
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
+      <el-table-column label="项目地址">
+        <template slot-scope="{row}">
+          <span>
+            {{row.itemProvince === row.itemCity ? row.itemCity + row.itemArea  + row.itemAddress : row.itemProvince + row.itemCity + row.itemArea  + row.itemAddress}}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="handlerDetail(scope.row)">
@@ -66,64 +109,96 @@
     />
     <!-- xiangqing弹框 -->
 
-    <businessDetailDialog v-if="dialogFormVisible" :data-info="dataInfo" @close="detailClose" />
+    <businessDetailDialog
+      v-if="dialogFormVisible"
+      :data-info="dataInfo"
+      @close="detailClose"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import businessDetailDialog from '../../components/mycomponent/dialog/business/businessDetailDialog.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import businessDetailDialog from "../../components/mycomponent/dialog/business/businessDetailDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/business/business'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import { listPage } from "../../api/business/business";
+export default {
+  // 加入分页逻辑
   components: {
     GroupPage,
-    businessDetailDialog
+    businessDetailDialog,
   },
   mixins: [listMixin],
   data() {
     return {
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
       dialogFormVisible: false,
-      dataInfo: {}
-    }
+      dataInfo: {},
+    };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     tableRowClassName: tableRowClassName,
     detailClose() {
-      this.dialogFormVisible = false
+      this.dialogFormVisible = false;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     handlerDetail(row) {
-      console.log(row)
-      this.dialogFormVisible = true
-      this.dataInfo = row
-    }
-  }
-
-}
+      console.log(row);
+      this.dialogFormVisible = true;
+      this.dataInfo = row;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -184,11 +259,9 @@
     color: #6666;
     margin: 30px 10px;
   }
-
 }
 
 .order-dialog {
-
   .dialog-tab {
     .dialog-title {
       font-size: 16px;
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 7045eaf..e1c37c7 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -1,21 +1,29 @@
 <!--商机报备表单-->
 <template>
   <div class="report-container">
-    <div class="report-title">
-      基础报备
-    </div>
+    <div class="report-title">基础报备</div>
     <div class="report-from">
-      <div class="from-title">
-        基础信息
-      </div>
+      <div class="from-title">基础信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemName" title="项目名称" placeholder="请输入项目名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemName"
+            title="项目名称"
+            placeholder="请输入项目名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemBudget" title="项目预算" placeholder="请输入项目预算" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemBudget"
+            title="项目预算"
+            placeholder="请输入项目预算"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -25,7 +33,7 @@
               value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
-              style="width:380px"
+              style="width: 380px"
             />
           </inputVue>
         </div>
@@ -43,7 +51,13 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.phone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.phone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -60,8 +74,18 @@
         <div class="input-item">
           <RedStar />
           <inputVue title="商机状态" class="inputWidth">
-            <el-select v-model="addInfo.status" clearable placeholder="请选择" style="width:380px">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select
+              v-model="addInfo.status"
+              clearable
+              placeholder="请选择"
+              style="width: 380px"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </inputVue>
         </div>
@@ -72,10 +96,15 @@
               v-model="addInfo.itemProvince"
               clearable
               placeholder="省/市"
-              style="width:150px;margin-left: 55px;"
+              style="width: 150px; margin-left: 55px"
               @change="provinceChange"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -83,29 +112,53 @@
               v-model="addInfo.itemCity"
               clearable
               placeholder="市/区"
-              style="width:150px"
+              style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.itemArea" clearable placeholder="县/街道" style="width:150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+            <el-select
+              v-model="addInfo.itemArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.itemAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.itemAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        关联方信息
-      </div>
+      <div class="from-title">关联方信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.ownerName" title="业主方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.ownerName"
+            title="业主方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -131,7 +184,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.contractName" title="总包方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.contractName"
+            title="总包方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -189,7 +248,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.agentName" title="代理商名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.agentName"
+            title="代理商名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -214,19 +279,29 @@
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        产品信息
-      </div>
+      <div class="from-title">产品信息</div>
       <div class="from-table">
-        <div style="margin-left: 2px;">
-          <el-table ref="tb" :data="addInfo.productList" border class="el-tab" style="width: 100%;">
+        <div style="margin-left: 2px">
+          <el-table
+            ref="tb"
+            :data="addInfo.productList"
+            border
+            class="el-tab"
+            style="width: 100%"
+          >
             <el-table-column type="index" label="序号" width="50px" />
+            
             <el-table-column prop="brandName" label="产品品牌" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.brandName }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.brandName" placeholder="请输入产品品牌">
                 </el-input> -->
-                <el-select v-if="showEdit[$index]" v-model="brandName" clearable placeholder="请输入产品品牌">
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="brandName"
+                  clearable
+                  placeholder="请输入产品品牌"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.brandCode"
@@ -237,7 +312,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="categoryIds" label="产品品类" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.categoryIds }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.categoryIds" placeholder="请输入产品品类">
                 </el-input> -->
@@ -257,8 +332,26 @@
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column prop="productName" label="产品名称" width="200px">
+              <template slot-scope="{ row, $index }">
+                <span v-if="!showEdit[$index]">{{ row.productName }}</span>
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productName"
+                  clearable
+                  placeholder="请输入产品型号"
+                >
+                  <el-option
+                    v-for="item in CodeList"
+                    :key="item.id + 1"
+                    :label="item.productName"
+                    :value="item.productName"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="productCode" label="产品型号" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productCode }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productCode" placeholder="请输入产品型号">
                 </el-input> -->
@@ -277,38 +370,63 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="productQuantity" label="产品数量" width="200px">
-              <template slot-scope="{row,$index}">
+            <el-table-column
+              prop="productQuantity"
+              label="产品数量"
+              width="200px"
+            >
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productQuantity }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productQuantity" placeholder="请输入产品数量" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productQuantity"
+                  placeholder="请输入产品数量"
+                />
               </template>
             </el-table-column>
             <el-table-column prop="productPrice" label="产品单价" width="200px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productPrice }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productPrice" placeholder="请输入产品单价" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productPrice"
+                  placeholder="请输入产品单价"
+                />
               </template>
             </el-table-column>
-            <el-table-column header-align="center" align="center" width="200" label="操作">
-              <template slot-scope="{row,$index}">
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showUpdate($index, row)">
+            <el-table-column
+              header-align="center"
+              align="center"
+              width="200"
+              label="操作"
+            >
+              <template slot-scope="{ row, $index }">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showUpdate($index, row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showDelete($index, row)">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showDelete($index, row)"
+                >
                   删除
                 </el-button>
                 <el-button
                   v-if="showEdit[$index]"
                   size="small"
-                  style="color: #85ce61;"
+                  style="color: #85ce61"
                   @click="submit($index, row)"
                 >
                   确定
                 </el-button>
                 <el-button
-                  v-if="showEdit[$index] && isFirst[$index] >1"
+                  v-if="showEdit[$index] && isFirst[$index] > 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="cancelUpdate($index)"
                 >
                   取消
@@ -316,7 +434,7 @@
                 <el-button
                   v-if="showEdit[$index] && isFirst[$index] === 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="showDelete($index)"
                 >
                   删除
@@ -327,300 +445,323 @@
         </div>
       </div>
       <div>
-          <el-button class="table-btn" @click="handleAddBtn">
-            添加项目需求
-          </el-button>
-        </div>
+        <el-button class="table-btn" @click="handleAddBtn">
+          添加项目需求
+        </el-button>
+      </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+      <el-button type="info" class="close" @click="close"> 取消 </el-button>
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { list } from '../../api/product/product'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { add } from '../../api/business/business'
-import { order_area } from '../../api/order/order'
-import { Message } from 'element-ui'
+import { list } from "../../api/product/product";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { add } from "../../api/business/business";
+import { order_area } from "../../api/order/order";
+import { Message } from "element-ui";
 export default {
   components: {
-    RedStar, inputVue
+    RedStar,
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
+      brandName: "",
+      categoryIds: "",
       CodeList: [],
       brandList: [],
       categoryList: [],
       checkedDetail: [],
       showEdit: [], // 用来判断是否处于编辑状态
-      isFirst:[], // 用来判断是否初次添加
+      isFirst: [], // 用来判断是否初次添加
       options: [
-        { value: '0', label: '推进' },
-        { value: '1', label: '成交' },
-        { value: '2', label: '丢失' }
+        { value: "0", label: "推进" },
+        { value: "1", label: "成交" },
+        { value: "2", label: "丢失" },
       ],
       addInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
-      }
-    }
+        countyList: [],
+      },
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
+        console.log(newval, oldval);
         if (!this.addInfo.itemProvince) {
-          this.addInfo.itemCity = ''
-          this.addInfo.itemArea = ''
+          this.addInfo.itemCity = "";
+          this.addInfo.itemArea = "";
         } else if (!this.addInfo.itemCity) {
-          this.addInfo.itemArea = ''
+          this.addInfo.itemArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
   },
-  mounted() {
-
-  },
+  mounted() {},
   methods: {
     save() {
-      if(this.valiateForm()){
-        this.addInfo.productList = {
-        productCode: this.addInfo.productList.productCode,
-        productQuantity: this.addInfo.productList.productQuantity,
-        productPrice: this.addInfo.productList.productPrice,
-        productName: ''
-      }
-      add(this.addInfo).then(res => {
-        this.setData()
+      if (this.valiateForm()) {
+        //   this.addInfo.productList = {
+        //   productCode: this.addInfo.productList.productCode,
+        //   productQuantity: this.addInfo.productList.productQuantity,
+        //   productPrice: this.addInfo.productList.productPrice,
+        //   productName: ''
+        // }
+        if(this.addInfo.productList.length && this.showEdit.every(item => item=== false)){
+          add(this.addInfo).then((res) => {
+          this.setData();
           this.$message({
-            message: '保存成功',
-            type: 'success'
-          })
-      }) 
+            message: "保存成功",
+            type: "success",
+          });
+        });
+        }else{
+          this.$message.error('请先添加或保存产品信息')
+        }
       } else {
         this.$message({
-            message: '请先完整填写报备信息',
-            type: 'error'
-          })
+          message: "请先完整填写报备信息",
+          type: "error",
+        });
       }
-      
     },
     close() {
-      this.setData()
+      this.setData();
     },
     provinceChange(e) {
-      console.log(e)
-      const index = this.form.provinceList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.provinceList[index].id
+      console.log(e);
+      const index = this.form.provinceList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.provinceList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(e) {
-      const index = this.form.cityList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.cityList[index].id
+      const index = this.form.cityList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.cityList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     handleAddBtn() {
-      const obj = {}
-      obj.brandName = ''
-      obj.categoryIds = ''
-      obj.productCode = ''
-      obj.productQuantity = ''
-      obj.productPrice = ''
-      this.addInfo.productList.push(obj)
-      this.showEdit[this.addInfo.productList.length-1] = true
-      this.isFirst[this.addInfo.productList.length - 1] = 1
-      C_list().then(res => {
-        console.log(res, '品类')
-        this.categoryList = res.data
-      })
-      SelectList().then(res => {
-        console.log(res, '品牌')
-        this.brandList = res
-      })
+      if (
+        this.showEdit[this.addInfo.productList.length - 1] === false ||
+        this.addInfo.productList.length === 0
+      ) {
+        const obj = {};
+        obj.brandName = "";
+        obj.categoryIds = "";
+        obj.productCode = "";
+        obj.productQuantity = "";
+        obj.productPrice = "";
+        obj.productName = "";
+        this.addInfo.productList.push(obj);
+        this.showEdit[this.addInfo.productList.length - 1] = true;
+        this.isFirst[this.addInfo.productList.length - 1] = 1;
+        C_list().then((res) => {
+          this.categoryList = res.data;
+        });
+        SelectList().then((res) => {
+          this.brandList = res;
+        });
+      } else {
+        this.$message.warning("请先保存上一次");
+      }
     },
     showUpdate(index, row) {
-      this.showEdit[index] = true
-      this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
-      this.brandName = row.brandName
-      this.categoryIds = row.categoryIds
-      this.addInfo.productList.productCode = row.productCode
-      this.addInfo.productList.productQuantity = row.productQuantity
-      this.addInfo.productList.productPrice = row.productPrice
+      this.showEdit[index] = true;
+      this.$set(this.showEdit, index, true); // 这里要用$set方法，否则页面状态不更新
+      this.brandName = row.brandName;
+      this.categoryIds = row.categoryIds;
+      this.addInfo.productList.productCode = row.productCode;
+      this.addInfo.productList.productQuantity = row.productQuantity;
+      this.addInfo.productList.productPrice = row.productPrice;
+      this.addInfo.productList.productName = row.productName;
     },
-    showDelete(index, row){
-      this.$confirm('确认删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    showDelete(index, row) {
+      this.$confirm("确认删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.addInfo.productList = this.addInfo.productList.filter((item,Index) => index!==Index)
-          this.showEdit = this.showEdit.filter((item,Index) => index!==Index)
-          this.isFirst = this.isFirst.filter((item,Index) => index!==Index)
+          this.addInfo.productList = this.addInfo.productList.filter(
+            (item, Index) => index !== Index
+          );
+          this.showEdit = this.showEdit.filter(
+            (item, Index) => index !== Index
+          );
+          this.isFirst = this.isFirst.filter((item, Index) => index !== Index);
           this.$message({
-            message: '已删除',
-            type: 'success'
-          })
+            message: "已删除",
+            type: "success",
+          });
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
+      const index = this.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      const code = this.categoryList[index].id;
+      console.log(code);
+      list({ categoryId: code }).then((res) => {
+        console.log(res);
+        this.CodeList = res;
+        // this.addInfo.productList.productName =''
+        // this.addInfo.productList.productCode =''
+      });
     },
     cancelUpdate(index) {
-      this.$confirm('取消修改？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("取消修改？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.$set(this.showEdit, index, false)
+          this.$set(this.showEdit, index, false);
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     submit(index, row) {
       // 发送请求，隐藏输入框
-      const { productCode, brandName, categoryIds, addInfo: { productList: { productQuantity, productPrice } } } = this
-      if (categoryIds&& brandName  && productQuantity && productPrice) {
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
+      const {
+        brandName,
+        categoryIds,
+        addInfo: {
+          productList: { productQuantity, productPrice },
+        },
+      } = this;
+      if (categoryIds && brandName) {
+        if (productQuantity > 0 && productPrice > 0) {
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$message({
+            type: "success",
+            message: "已缓存，记得点击保存提交修改喔！",
+            duration: 888,
+            onClose: () => {
+              this.$set(this.showEdit, index, false); // vue添加属性的方法
+            },
+          });
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$set(this.isFirst, index, 2);
+          this.brandName = "";
+          this.categoryIds = "";
+          this.addInfo.productList.productCode = "";
+          this.addInfo.productList.productQuantity = "";
+          this.addInfo.productList.productPrice = "";
+          this.addInfo.productList.productName = "";
+        } else {
+          this.$message.error("单价或数量需大于等于1");
+        }
+      } else {
         this.$message({
-          type: 'success',
-          message: '已缓存，记得点击保存提交修改喔！',
-          duration: 888,
-          onClose: () => {
-            this.$set(this.showEdit, index, false) // vue添加属性的方法
-          }
-        })
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
-        this.$set(this.isFirst, index, 2)
-        this.brandName = ''
-        this.categoryIds = ''
-        this.addInfo.productList.productCode = ''
-        this.addInfo.productList.productQuantity = ''
-        this.addInfo.productList.productPrice = ''
-      } else{
-        this.$message({
-              message: "请先完整选择或填写信息",
-              type: "error",
-            });
+          message: "请先完整选择或填写信息",
+          type: "error",
+        });
       }
     },
     setData() {
       this.addInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
+      };
     },
     valiateForm() {
-      let arr = []
-      for(var item in this.addInfo) {
-        if(this.addInfo[item]){
-          arr.push(1)
-        }else{
-          arr.push(0)
+      let arr = [];
+      for (var item in this.addInfo) {
+        if (this.addInfo[item]) {
+          arr.push(1);
+        } else {
+          arr.push(0);
         }
       }
-      return arr.every(item => item === 1)
-    }
-  }
-}
+      return arr.every((item) => item === 1);
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -673,7 +814,6 @@
     .close {
       width: 100px;
     }
-
   }
 }
 </style>
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 6638e3b..c899612 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -30,7 +30,12 @@
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
     >
-      <el-table-column prop="index" width="100px" label="序号" />
+      <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="distributorCode" width="200px" label="经销商编号" />
       <el-table-column prop="distributorName" width="400px" label="经销商名称" />
       <el-table-column prop="companyNatureName" width="150px" label="单位性质" />
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index de08ec0..704a758 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -92,7 +92,12 @@
       style="width: 100%"
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="account" label="账号" />
       <el-table-column prop="province" label="省" />
       <el-table-column prop="city" label="市" />
@@ -176,9 +181,19 @@
     },
     reset() {
       this.selectInfo = {
-        recommendType: '',
-        recommendTitle: ''
+        account: '',
+        province: '',
+        city: '',
+        area: ''
       }
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((offset - 1) * 10)
+        })
+        this.tableData = res
+      })
+
     },
     Bdelete(row) {
       // console.log(row);
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index ae070d5..5cc02cf 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -55,6 +55,11 @@
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
       <el-table-column prop="date" label="序号" />
+      <!-- <el-table-column type="index" label="序号" > -->
+      <!-- <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column> -->
       <el-table-column prop="name" label="账号" />
       <el-table-column prop="address" label="用户名" />
       <el-table-column prop="address1" label="姓名" />
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index cc4041f..94f52ad 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -76,6 +76,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
+          @click="batchDelete"
         >
           删除
         </el-button>
@@ -91,9 +92,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      ref="multipleTable"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="messageCode" label="消息编号" />
       <el-table-column prop="messageTitle" label="消息标题" />
       <el-table-column prop="messageContent" label="消息内容" />
@@ -106,6 +113,7 @@
           <el-button
             type="text"
             size="small"
+            @click="remove(scope.row)"
           >
             删除
           </el-button>
@@ -127,7 +135,7 @@
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/move/message'
+import { listPage ,deleteBatch ,deleteInfo} from '../../api/move/message'
 export default { // 加入分页逻辑
   components: {
     MassageAddDialog,
@@ -184,6 +192,44 @@
       this.isShowAdd = true
       this.title = '消息推送编辑'
       this.$refs.addMessage.init(row)
+    },
+    // 批量删除
+    batchDelete(){
+      if(this.$refs.multipleTable.selection.length){
+        this.$confirm(`确认删除选中的这些数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+         //  得到选中行
+         const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            deleteBatch({ ids: ids }).then((res) => {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+              });
+              this.refresh();
+            });
+      }).catch(()=>{})
+      }else{
+        this.$message.error('请先选择需要删除的消息记录')
+      }
+    },
+    remove(row){
+      this.$confirm(`确认删除此项数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+        deleteInfo({id:row.id}).then(()=>{
+          this.$message.success('操作成功')
+          this.refresh();
+        })
+      }).catch(()=>{})
     }
   }
 }
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 0f26885..1c67bdb 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -35,7 +35,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="id" label="序号" />
+      <el-table-column type="index" label="序号" />
       <el-table-column prop="orderId" label="订单号" />
       <el-table-column prop="userName" label="下单人" />
       <el-table-column prop="userPhone" label="联系方式" />
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index ab6f457..514371a 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -403,11 +403,11 @@
     },
     valiateProduct() {
       // 验证产品列表
-      if (this.addInfo.productList.length) {
+      if (this.addInfo.productList.length && this.showEdit.every(item => item=== false)) {
         return true;
       } else {
         this.$message({
-          message: "产品列表不能为空",
+          message: "请先添加或保存产品信息",
           type: "error",
         });
         return false;
@@ -478,6 +478,7 @@
           }
         })
         row.productCode = this.addInfo.productList.productCode
+        
         row.brandName = this.brandName
         row.categoryIds = this.categoryIds
         row.productQuantity = this.addInfo.productList.productQuantity
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 2dfc80a..652300f 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -91,6 +91,11 @@
     >
       <el-table-column type="selection" width="55" />
       <!--      <el-table-column prop="index" width="75" label="序号" />-->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -284,7 +289,16 @@
       })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows)
+          res.rows = res.rows.map(item =>{
+            return{
+              编号:item.brandCode,
+              '名称':item.brandName,
+              性质:item.brandProperty,
+              品类:item.categoryStr,
+              供应商:item.supplierStr
+            }
+          })
+          outToExcel(res.rows,'品牌列表')
           loading.close() // 关闭加载动画
           this.$message({
             message: '导出成功',
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 8767f49..71ae178 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -82,7 +82,12 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" width="60" />
+      <!-- <el-table-column type="index" label="序号" width="60" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index e1e9818..feb9245 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -93,6 +93,16 @@
         type="selection"
         width="55"
       />
+      <!-- <el-table-column
+        type="index"
+        width="55"
+        label="编号"
+      /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column
         prop="snCode"
         label="SN码"
@@ -166,6 +176,7 @@
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
 import { SelectList } from '../../api/product/brand'
 import { exportFile } from '@/utils/exportutils'
+import { export_json_to_excel } from "../../utils/Export2Excel";
 export default {
   components: {
     DataInfoItem,
@@ -301,6 +312,46 @@
         fileName = fileName.replace(/-|:| /g, '')
         exportFile(blob, fileName)
       })
+      // d_listPage("offset=1", {}).then((res) => {
+      //   console.log(res.rows, "全部数据");
+        // 对数据进行加工
+        // res.rows = res.rows.map((item) => {
+        //   return {
+        //     产品名称: item.productName,
+        //     产品品牌: item.brandName,
+        //     产品型号: item.productCode,
+        //     产品品类: item.categoryStr,
+        //     产品颜色: item.productColor,
+        //     产品材质: item.productMaterialQuality,
+        //     产品状态: item.productStatus,
+        //     产品版本: item.productEdition,
+        //     规格: item.productPackageSize,
+        //     重量: item.productWeight,
+        //     国际69码: item.internationalCode,
+        //     更新时间: item.updateTime,
+        //   };
+        // });
+      //   this.ExportTable = res.rows;
+      //   const header = Object.keys(res.rows[0]);
+      //   console.log(header);
+      //   const data = res.rows.map((user, index) => {
+      //     const userArr = [];
+      //     console.log(user, index);
+      //     for (const key in res.rows[0]) {
+      //       // console.log(res.rows[key]);
+      //       const item = user[key];
+      //       userArr.push(item);
+      //     }
+      //     return userArr;
+      //   });
+      //   console.log(data);
+      //   // //把定义好的header和data放进export_json_to_excel的函数里作为参数
+      //   export_json_to_excel({
+      //     header,
+      //     data,
+      //     filename: "设备列表",
+      //   });
+      // });
     }
   }
 }
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index a84eeeb..f0bfbd1 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -73,8 +73,13 @@
         :header-cell-style="{ background: '#2483b3', color: 'white' }"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column type="index" label="编号" width="60" />
+        <!-- <el-table-column type="index" label="编号" width="60" /> -->
         <!--        <el-table-column header-align="center" align="center" prop="id" label="序号" />-->
+        <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
         <el-table-column
           header-align="center"
           align="center"
diff --git a/src/views/product/snCodeField.vue b/src/views/product/snCodeField.vue
index 14d8f18..8edeb97 100644
--- a/src/views/product/snCodeField.vue
+++ b/src/views/product/snCodeField.vue
@@ -80,6 +80,11 @@
     >
       <el-table-column type="selection" width="55" />
       <!--      <el-table-column prop="index" label="序号" />-->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="snFixedId" label="SN码（固定标识）" />
       <el-table-column prop="snFixedIllustration" label="SN码（固定标识）说明" />
       <el-table-column prop="snStartCode" label="SN码（起始序列号）" />
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 2a7b833..9ce7755 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -79,6 +79,11 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="snCode" label="SN码（固定标识）" />
       <el-table-column prop="snQuantity" label="SN码（固定标识）个数" />
       <el-table-column prop="snIllustration" label="SN码（固定标识）说明" />

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..edf644f
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/move/message.js b/src/api/move/message.js
index 297d8da..86aaf38 100644
--- a/src/api/move/message.js
+++ b/src/api/move/message.js
@@ -15,4 +15,10 @@
 const update = (data) => {
   return instance.post('/appPushInfo/update', data)
 }
-export { listPage, add }
+const deleteBatch = (data) => {
+  return instance.post('/appPushInfo/batchDelete',data)
+}
+const deleteInfo =(data)=>{
+  return instance.post('/appPushInfo//delete',data)
+}
+export { listPage, add, deleteBatch,deleteInfo }
diff --git a/src/components/mycomponent/dialog/business/businessDetailDialog.vue b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
index 359384c..1ec5a4c 100644
--- a/src/components/mycomponent/dialog/business/businessDetailDialog.vue
+++ b/src/components/mycomponent/dialog/business/businessDetailDialog.vue
@@ -75,7 +75,7 @@
         <div class="input-item">
           <RedStar />
           <inputVue
-            v-model="dataInfo.status"
+            v-model="dataInfo.organization"
             title="单位组织"
             disabled
             placeholder="请输入单位组织"
@@ -255,9 +255,9 @@
       </div>
       <div class="from-table">
         <el-table :data="tableData" border class="el-tab" style="width: 100%;">
-          <el-table-column prop="id" label="序号" width="150px" />
-          <el-table-column prop="busOppoId" label="产品品牌" />
-          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column type="index" label="序号" width="60px" />
+          <el-table-column prop="brandName" label="产品品牌" />
+          <!-- <el-table-column prop="categoryName" label="产品品类" /> -->
           <el-table-column prop="productCode" label="产品型号" />
           <el-table-column prop="productQuantity" label="产品数量" />
           <el-table-column prop="productPrice" label="产品单价" />
@@ -299,7 +299,6 @@
   mounted() {
     const id = this.dataInfo.id
     businessDetail({ id: id }).then(res => {
-      console.log(res)
       this.tableData = res.productList
     })
   },
diff --git a/src/components/mycomponent/dialog/orderDetailDialog.vue b/src/components/mycomponent/dialog/orderDetailDialog.vue
index 49793af..e797d52 100644
--- a/src/components/mycomponent/dialog/orderDetailDialog.vue
+++ b/src/components/mycomponent/dialog/orderDetailDialog.vue
@@ -117,7 +117,6 @@
         style="width: 100%"
       >
         <el-table-column type="index" label="序号" />
-        <el-table-column prop="productName" label="产品名称" />
         <el-table-column prop="branchName" label="产品品牌" />
         <el-table-column prop="categoryName" label="产品品类" />
         <el-table-column prop="productCode" label="产品型号" />
diff --git a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
index 4cae18a..25f5978 100644
--- a/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
+++ b/src/components/mycomponent/dialog/salesDialog/slaesChangeOrderDialog.vue
@@ -182,15 +182,16 @@
         temp.deliveryArea = this.AreaList[aindex].areaName;
         turnOrder(temp).then((res) => {
           this.$message.success("添加成功");
-          this.close();
+          this.$emit("close");
+          this.reset();
         });
-      }else {
-        console.log(this.valiatePhone())
-        if(this.valiatePhone() === false){
+      } else {
+        console.log(this.valiatePhone());
+        if (this.valiatePhone() === false) {
           this.$message.error("请检查手机号格式是否正确");
-        }else if(this.valiateProvince() === false){
+        } else if (this.valiateProvince() === false) {
           this.$message.error("请检查地址格式是否正确");
-        }else{
+        } else {
           this.$message.error("请正确填写信息");
         }
       }
diff --git a/src/components/mycomponent/groupPage.vue b/src/components/mycomponent/groupPage.vue
index 666edc1..372e253 100644
--- a/src/components/mycomponent/groupPage.vue
+++ b/src/components/mycomponent/groupPage.vue
@@ -1,7 +1,7 @@
 <!--分页组件-->
 <template>
   <div class="footer">
-    <div>共{{ total }}页记录 第{{ offset }}/{{ total }}页</div>
+    <div>共{{ count }}条记录 第{{ offset }}/{{ total }}页</div>
     <div>
       <el-pagination
         ref="compontentPage"
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index 4398baa..241cdd4 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -5,22 +5,48 @@
       <div class="productInput">
         项目名称
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemName" placeholder="请输入项目名称" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemName"
+            placeholder="请输入项目名称"
+            clearable
+            class="product-input"
+          />
         </div>
         项目预算
         <div class="inputBox" style="width: 300px">
-          <el-input v-model="selectInfo.itemBudget" placeholder="请输入项目预算" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.itemBudget"
+            placeholder="请输入项目预算"
+            clearable
+            class="product-input"
+          />
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
+          <el-date-picker
+            v-model="selectInfo.itemDuration"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择日期"
+            class="product-input"
+          />
         </div>
       </div>
       <div class="productBtn">
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
       </div>
@@ -39,14 +65,31 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="busOppoId" label="商机编号" />
       <el-table-column prop="itemName" label="项目名称" />
       <el-table-column prop="itemBudget" label="项目预算" />
-      <el-table-column prop="itemDuration" label="预计工期" />
+      <el-table-column prop="itemDuration" label="预计工期" >
+        <template slot-scope="{row}">
+          <span>
+           {{row.itemDuration.split(' ')[0]}}
+          </span>
+        </template>
+    </el-table-column>
       <el-table-column prop="itemManager" label="商机负责人" />
       <el-table-column prop="phone" label="联系方式" />
       <el-table-column prop="status" label="商机状态" />
+      <el-table-column label="项目地址">
+        <template slot-scope="{row}">
+          <span>
+            {{row.itemProvince === row.itemCity ? row.itemCity + row.itemArea  + row.itemAddress : row.itemProvince + row.itemCity + row.itemArea  + row.itemAddress}}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="handlerDetail(scope.row)">
@@ -66,64 +109,96 @@
     />
     <!-- xiangqing弹框 -->
 
-    <businessDetailDialog v-if="dialogFormVisible" :data-info="dataInfo" @close="detailClose" />
+    <businessDetailDialog
+      v-if="dialogFormVisible"
+      :data-info="dataInfo"
+      @close="detailClose"
+    />
   </div>
 </template>
 
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import businessDetailDialog from '../../components/mycomponent/dialog/business/businessDetailDialog.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import businessDetailDialog from "../../components/mycomponent/dialog/business/businessDetailDialog.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/business/business'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import { listPage } from "../../api/business/business";
+export default {
+  // 加入分页逻辑
   components: {
     GroupPage,
-    businessDetailDialog
+    businessDetailDialog,
   },
   mixins: [listMixin],
   data() {
     return {
       selectInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
       },
       dialogFormVisible: false,
-      dataInfo: {}
-    }
+      dataInfo: {},
+    };
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     tableRowClassName: tableRowClassName,
     detailClose() {
-      this.dialogFormVisible = false
+      this.dialogFormVisible = false;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     reset() {
-      this.selectInfo = { // 搜索框中的数据的数据
-        itemName: '',
-        itemBudget: '',
-        itemDuration: ''
-      }
+      this.selectInfo = {
+        // 搜索框中的数据的数据
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+      };
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(
+        (res) => {
+          res.rows = res.rows.map((item) => {
+            return {
+              ...item,
+              status:
+                item.status === "0"
+                  ? "推进"
+                  : item.status === "1"
+                  ? "成交"
+                  : "丢失",
+            };
+          });
+          this.tableData = res;
+        }
+      );
     },
     handlerDetail(row) {
-      console.log(row)
-      this.dialogFormVisible = true
-      this.dataInfo = row
-    }
-  }
-
-}
+      console.log(row);
+      this.dialogFormVisible = true;
+      this.dataInfo = row;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -184,11 +259,9 @@
     color: #6666;
     margin: 30px 10px;
   }
-
 }
 
 .order-dialog {
-
   .dialog-tab {
     .dialog-title {
       font-size: 16px;
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 7045eaf..e1c37c7 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -1,21 +1,29 @@
 <!--商机报备表单-->
 <template>
   <div class="report-container">
-    <div class="report-title">
-      基础报备
-    </div>
+    <div class="report-title">基础报备</div>
     <div class="report-from">
-      <div class="from-title">
-        基础信息
-      </div>
+      <div class="from-title">基础信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemName" title="项目名称" placeholder="请输入项目名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemName"
+            title="项目名称"
+            placeholder="请输入项目名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.itemBudget" title="项目预算" placeholder="请输入项目预算" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.itemBudget"
+            title="项目预算"
+            placeholder="请输入项目预算"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -25,7 +33,7 @@
               value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
-              style="width:380px"
+              style="width: 380px"
             />
           </inputVue>
         </div>
@@ -43,7 +51,13 @@
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.phone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.phone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -60,8 +74,18 @@
         <div class="input-item">
           <RedStar />
           <inputVue title="商机状态" class="inputWidth">
-            <el-select v-model="addInfo.status" clearable placeholder="请选择" style="width:380px">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select
+              v-model="addInfo.status"
+              clearable
+              placeholder="请选择"
+              style="width: 380px"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </inputVue>
         </div>
@@ -72,10 +96,15 @@
               v-model="addInfo.itemProvince"
               clearable
               placeholder="省/市"
-              style="width:150px;margin-left: 55px;"
+              style="width: 150px; margin-left: 55px"
               @change="provinceChange"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -83,29 +112,53 @@
               v-model="addInfo.itemCity"
               clearable
               placeholder="市/区"
-              style="width:150px"
+              style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.itemArea" clearable placeholder="县/街道" style="width:150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.areaName" :value="item.areaName" />
+            <el-select
+              v-model="addInfo.itemArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.areaName"
+                :value="item.areaName"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.itemAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.itemAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        关联方信息
-      </div>
+      <div class="from-title">关联方信息</div>
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.ownerName" title="业主方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.ownerName"
+            title="业主方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -131,7 +184,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.contractName" title="总包方名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.contractName"
+            title="总包方名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -189,7 +248,13 @@
       <div class="from-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.agentName" title="代理商名称" placeholder="请输入名称" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.agentName"
+            title="代理商名称"
+            placeholder="请输入名称"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -214,19 +279,29 @@
       </div>
     </div>
     <div class="report-from">
-      <div class="from-title">
-        产品信息
-      </div>
+      <div class="from-title">产品信息</div>
       <div class="from-table">
-        <div style="margin-left: 2px;">
-          <el-table ref="tb" :data="addInfo.productList" border class="el-tab" style="width: 100%;">
+        <div style="margin-left: 2px">
+          <el-table
+            ref="tb"
+            :data="addInfo.productList"
+            border
+            class="el-tab"
+            style="width: 100%"
+          >
             <el-table-column type="index" label="序号" width="50px" />
+            
             <el-table-column prop="brandName" label="产品品牌" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.brandName }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.brandName" placeholder="请输入产品品牌">
                 </el-input> -->
-                <el-select v-if="showEdit[$index]" v-model="brandName" clearable placeholder="请输入产品品牌">
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="brandName"
+                  clearable
+                  placeholder="请输入产品品牌"
+                >
                   <el-option
                     v-for="item in brandList"
                     :key="item.brandCode"
@@ -237,7 +312,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="categoryIds" label="产品品类" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.categoryIds }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.categoryIds" placeholder="请输入产品品类">
                 </el-input> -->
@@ -257,8 +332,26 @@
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column prop="productName" label="产品名称" width="200px">
+              <template slot-scope="{ row, $index }">
+                <span v-if="!showEdit[$index]">{{ row.productName }}</span>
+                <el-select
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productName"
+                  clearable
+                  placeholder="请输入产品型号"
+                >
+                  <el-option
+                    v-for="item in CodeList"
+                    :key="item.id + 1"
+                    :label="item.productName"
+                    :value="item.productName"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="productCode" label="产品型号" width="240px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productCode }}</span>
                 <!-- <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productCode" placeholder="请输入产品型号">
                 </el-input> -->
@@ -277,38 +370,63 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="productQuantity" label="产品数量" width="200px">
-              <template slot-scope="{row,$index}">
+            <el-table-column
+              prop="productQuantity"
+              label="产品数量"
+              width="200px"
+            >
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productQuantity }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productQuantity" placeholder="请输入产品数量" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productQuantity"
+                  placeholder="请输入产品数量"
+                />
               </template>
             </el-table-column>
             <el-table-column prop="productPrice" label="产品单价" width="200px">
-              <template slot-scope="{row,$index}">
+              <template slot-scope="{ row, $index }">
                 <span v-if="!showEdit[$index]">{{ row.productPrice }}</span>
-                <el-input v-if="showEdit[$index]" v-model="addInfo.productList.productPrice" placeholder="请输入产品单价" />
+                <el-input
+                  v-if="showEdit[$index]"
+                  v-model="addInfo.productList.productPrice"
+                  placeholder="请输入产品单价"
+                />
               </template>
             </el-table-column>
-            <el-table-column header-align="center" align="center" width="200" label="操作">
-              <template slot-scope="{row,$index}">
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showUpdate($index, row)">
+            <el-table-column
+              header-align="center"
+              align="center"
+              width="200"
+              label="操作"
+            >
+              <template slot-scope="{ row, $index }">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showUpdate($index, row)"
+                >
                   编辑
                 </el-button>
-                <el-button v-if="!showEdit[$index]"  size="small" @click="showDelete($index, row)">
+                <el-button
+                  v-if="!showEdit[$index]"
+                  size="small"
+                  @click="showDelete($index, row)"
+                >
                   删除
                 </el-button>
                 <el-button
                   v-if="showEdit[$index]"
                   size="small"
-                  style="color: #85ce61;"
+                  style="color: #85ce61"
                   @click="submit($index, row)"
                 >
                   确定
                 </el-button>
                 <el-button
-                  v-if="showEdit[$index] && isFirst[$index] >1"
+                  v-if="showEdit[$index] && isFirst[$index] > 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="cancelUpdate($index)"
                 >
                   取消
@@ -316,7 +434,7 @@
                 <el-button
                   v-if="showEdit[$index] && isFirst[$index] === 1"
                   size="small"
-                  style="color: red;"
+                  style="color: red"
                   @click="showDelete($index)"
                 >
                   删除
@@ -327,300 +445,323 @@
         </div>
       </div>
       <div>
-          <el-button class="table-btn" @click="handleAddBtn">
-            添加项目需求
-          </el-button>
-        </div>
+        <el-button class="table-btn" @click="handleAddBtn">
+          添加项目需求
+        </el-button>
+      </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+      <el-button type="info" class="close" @click="close"> 取消 </el-button>
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { list } from '../../api/product/product'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { add } from '../../api/business/business'
-import { order_area } from '../../api/order/order'
-import { Message } from 'element-ui'
+import { list } from "../../api/product/product";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { add } from "../../api/business/business";
+import { order_area } from "../../api/order/order";
+import { Message } from "element-ui";
 export default {
   components: {
-    RedStar, inputVue
+    RedStar,
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
+      brandName: "",
+      categoryIds: "",
       CodeList: [],
       brandList: [],
       categoryList: [],
       checkedDetail: [],
       showEdit: [], // 用来判断是否处于编辑状态
-      isFirst:[], // 用来判断是否初次添加
+      isFirst: [], // 用来判断是否初次添加
       options: [
-        { value: '0', label: '推进' },
-        { value: '1', label: '成交' },
-        { value: '2', label: '丢失' }
+        { value: "0", label: "推进" },
+        { value: "1", label: "成交" },
+        { value: "2", label: "丢失" },
       ],
       addInfo: {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
-      }
-    }
+        countyList: [],
+      },
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
+        console.log(newval, oldval);
         if (!this.addInfo.itemProvince) {
-          this.addInfo.itemCity = ''
-          this.addInfo.itemArea = ''
+          this.addInfo.itemCity = "";
+          this.addInfo.itemArea = "";
         } else if (!this.addInfo.itemCity) {
-          this.addInfo.itemArea = ''
+          this.addInfo.itemArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
   },
-  mounted() {
-
-  },
+  mounted() {},
   methods: {
     save() {
-      if(this.valiateForm()){
-        this.addInfo.productList = {
-        productCode: this.addInfo.productList.productCode,
-        productQuantity: this.addInfo.productList.productQuantity,
-        productPrice: this.addInfo.productList.productPrice,
-        productName: ''
-      }
-      add(this.addInfo).then(res => {
-        this.setData()
+      if (this.valiateForm()) {
+        //   this.addInfo.productList = {
+        //   productCode: this.addInfo.productList.productCode,
+        //   productQuantity: this.addInfo.productList.productQuantity,
+        //   productPrice: this.addInfo.productList.productPrice,
+        //   productName: ''
+        // }
+        if(this.addInfo.productList.length && this.showEdit.every(item => item=== false)){
+          add(this.addInfo).then((res) => {
+          this.setData();
           this.$message({
-            message: '保存成功',
-            type: 'success'
-          })
-      }) 
+            message: "保存成功",
+            type: "success",
+          });
+        });
+        }else{
+          this.$message.error('请先添加或保存产品信息')
+        }
       } else {
         this.$message({
-            message: '请先完整填写报备信息',
-            type: 'error'
-          })
+          message: "请先完整填写报备信息",
+          type: "error",
+        });
       }
-      
     },
     close() {
-      this.setData()
+      this.setData();
     },
     provinceChange(e) {
-      console.log(e)
-      const index = this.form.provinceList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.provinceList[index].id
+      console.log(e);
+      const index = this.form.provinceList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.provinceList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(e) {
-      const index = this.form.cityList.findIndex(item => {
-        return item.areaName == e
-      })
-      const code = this.form.cityList[index].id
+      const index = this.form.cityList.findIndex((item) => {
+        return item.areaName == e;
+      });
+      const code = this.form.cityList[index].id;
       order_area(`pid=${code}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     handleAddBtn() {
-      const obj = {}
-      obj.brandName = ''
-      obj.categoryIds = ''
-      obj.productCode = ''
-      obj.productQuantity = ''
-      obj.productPrice = ''
-      this.addInfo.productList.push(obj)
-      this.showEdit[this.addInfo.productList.length-1] = true
-      this.isFirst[this.addInfo.productList.length - 1] = 1
-      C_list().then(res => {
-        console.log(res, '品类')
-        this.categoryList = res.data
-      })
-      SelectList().then(res => {
-        console.log(res, '品牌')
-        this.brandList = res
-      })
+      if (
+        this.showEdit[this.addInfo.productList.length - 1] === false ||
+        this.addInfo.productList.length === 0
+      ) {
+        const obj = {};
+        obj.brandName = "";
+        obj.categoryIds = "";
+        obj.productCode = "";
+        obj.productQuantity = "";
+        obj.productPrice = "";
+        obj.productName = "";
+        this.addInfo.productList.push(obj);
+        this.showEdit[this.addInfo.productList.length - 1] = true;
+        this.isFirst[this.addInfo.productList.length - 1] = 1;
+        C_list().then((res) => {
+          this.categoryList = res.data;
+        });
+        SelectList().then((res) => {
+          this.brandList = res;
+        });
+      } else {
+        this.$message.warning("请先保存上一次");
+      }
     },
     showUpdate(index, row) {
-      this.showEdit[index] = true
-      this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
-      this.brandName = row.brandName
-      this.categoryIds = row.categoryIds
-      this.addInfo.productList.productCode = row.productCode
-      this.addInfo.productList.productQuantity = row.productQuantity
-      this.addInfo.productList.productPrice = row.productPrice
+      this.showEdit[index] = true;
+      this.$set(this.showEdit, index, true); // 这里要用$set方法，否则页面状态不更新
+      this.brandName = row.brandName;
+      this.categoryIds = row.categoryIds;
+      this.addInfo.productList.productCode = row.productCode;
+      this.addInfo.productList.productQuantity = row.productQuantity;
+      this.addInfo.productList.productPrice = row.productPrice;
+      this.addInfo.productList.productName = row.productName;
     },
-    showDelete(index, row){
-      this.$confirm('确认删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    showDelete(index, row) {
+      this.$confirm("确认删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.addInfo.productList = this.addInfo.productList.filter((item,Index) => index!==Index)
-          this.showEdit = this.showEdit.filter((item,Index) => index!==Index)
-          this.isFirst = this.isFirst.filter((item,Index) => index!==Index)
+          this.addInfo.productList = this.addInfo.productList.filter(
+            (item, Index) => index !== Index
+          );
+          this.showEdit = this.showEdit.filter(
+            (item, Index) => index !== Index
+          );
+          this.isFirst = this.isFirst.filter((item, Index) => index !== Index);
           this.$message({
-            message: '已删除',
-            type: 'success'
-          })
+            message: "已删除",
+            type: "success",
+          });
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
+      const index = this.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      const code = this.categoryList[index].id;
+      console.log(code);
+      list({ categoryId: code }).then((res) => {
+        console.log(res);
+        this.CodeList = res;
+        // this.addInfo.productList.productName =''
+        // this.addInfo.productList.productCode =''
+      });
     },
     cancelUpdate(index) {
-      this.$confirm('取消修改？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("取消修改？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          this.$set(this.showEdit, index, false)
+          this.$set(this.showEdit, index, false);
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     submit(index, row) {
       // 发送请求，隐藏输入框
-      const { productCode, brandName, categoryIds, addInfo: { productList: { productQuantity, productPrice } } } = this
-      if (categoryIds&& brandName  && productQuantity && productPrice) {
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
+      const {
+        brandName,
+        categoryIds,
+        addInfo: {
+          productList: { productQuantity, productPrice },
+        },
+      } = this;
+      if (categoryIds && brandName) {
+        if (productQuantity > 0 && productPrice > 0) {
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$message({
+            type: "success",
+            message: "已缓存，记得点击保存提交修改喔！",
+            duration: 888,
+            onClose: () => {
+              this.$set(this.showEdit, index, false); // vue添加属性的方法
+            },
+          });
+          row.productCode = this.addInfo.productList.productCode;
+          row.brandName = this.brandName;
+          row.categoryIds = this.categoryIds;
+          row.productQuantity = this.addInfo.productList.productQuantity;
+          row.productPrice = this.addInfo.productList.productPrice;
+          row.productName = this.addInfo.productList.productName;
+          this.$set(this.isFirst, index, 2);
+          this.brandName = "";
+          this.categoryIds = "";
+          this.addInfo.productList.productCode = "";
+          this.addInfo.productList.productQuantity = "";
+          this.addInfo.productList.productPrice = "";
+          this.addInfo.productList.productName = "";
+        } else {
+          this.$message.error("单价或数量需大于等于1");
+        }
+      } else {
         this.$message({
-          type: 'success',
-          message: '已缓存，记得点击保存提交修改喔！',
-          duration: 888,
-          onClose: () => {
-            this.$set(this.showEdit, index, false) // vue添加属性的方法
-          }
-        })
-        row.productCode = this.addInfo.productList.productCode
-        row.brandName = this.brandName
-        row.categoryIds = this.categoryIds
-        row.productQuantity = this.addInfo.productList.productQuantity
-        row.productPrice = this.addInfo.productList.productPrice
-        this.$set(this.isFirst, index, 2)
-        this.brandName = ''
-        this.categoryIds = ''
-        this.addInfo.productList.productCode = ''
-        this.addInfo.productList.productQuantity = ''
-        this.addInfo.productList.productPrice = ''
-      } else{
-        this.$message({
-              message: "请先完整选择或填写信息",
-              type: "error",
-            });
+          message: "请先完整选择或填写信息",
+          type: "error",
+        });
       }
     },
     setData() {
       this.addInfo = {
-        itemName: '',
-        itemBudget: '',
-        itemDuration: '',
-        itemManager: '',
-        phone: '',
-        organization: '',
-        status: '',
-        itemProvince: '',
-        itemCity: '',
-        itemArea: '',
-        itemAddress: '',
-        ownerName: '', // 业主方
-        ownerContacts: '',
-        ownerPhone: '',
-        contractName: '', // 总包方
-        contractContacts: '',
-        contractPhone: '',
-        constructName: '', // 施工方
-        constructContacts: '',
-        constructPhone: '',
-        agentName: '', // 代理商
-        agentContacts: '',
-        agentPhone: '',
-        productList: []
-      }
+        itemName: "",
+        itemBudget: "",
+        itemDuration: "",
+        itemManager: "",
+        phone: "",
+        organization: "",
+        status: "",
+        itemProvince: "",
+        itemCity: "",
+        itemArea: "",
+        itemAddress: "",
+        ownerName: "", // 业主方
+        ownerContacts: "",
+        ownerPhone: "",
+        contractName: "", // 总包方
+        contractContacts: "",
+        contractPhone: "",
+        constructName: "", // 施工方
+        constructContacts: "",
+        constructPhone: "",
+        agentName: "", // 代理商
+        agentContacts: "",
+        agentPhone: "",
+        productList: [],
+      };
     },
     valiateForm() {
-      let arr = []
-      for(var item in this.addInfo) {
-        if(this.addInfo[item]){
-          arr.push(1)
-        }else{
-          arr.push(0)
+      let arr = [];
+      for (var item in this.addInfo) {
+        if (this.addInfo[item]) {
+          arr.push(1);
+        } else {
+          arr.push(0);
         }
       }
-      return arr.every(item => item === 1)
-    }
-  }
-}
+      return arr.every((item) => item === 1);
+    },
+  },
+};
 </script>
 
 <style lang='scss' scoped>
@@ -673,7 +814,6 @@
     .close {
       width: 100px;
     }
-
   }
 }
 </style>
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 6638e3b..c899612 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -30,7 +30,12 @@
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
     >
-      <el-table-column prop="index" width="100px" label="序号" />
+      <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="distributorCode" width="200px" label="经销商编号" />
       <el-table-column prop="distributorName" width="400px" label="经销商名称" />
       <el-table-column prop="companyNatureName" width="150px" label="单位性质" />
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index de08ec0..704a758 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -92,7 +92,12 @@
       style="width: 100%"
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="account" label="账号" />
       <el-table-column prop="province" label="省" />
       <el-table-column prop="city" label="市" />
@@ -176,9 +181,19 @@
     },
     reset() {
       this.selectInfo = {
-        recommendType: '',
-        recommendTitle: ''
+        account: '',
+        province: '',
+        city: '',
+        area: ''
       }
+      listPage(`limit=${this.limit}&offset=${this.offset}`, {}).then(res => {
+      // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = (index + 1) + ((offset - 1) * 10)
+        })
+        this.tableData = res
+      })
+
     },
     Bdelete(row) {
       // console.log(row);
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index ae070d5..5cc02cf 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -55,6 +55,11 @@
     >
       <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
       <el-table-column prop="date" label="序号" />
+      <!-- <el-table-column type="index" label="序号" > -->
+      <!-- <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column> -->
       <el-table-column prop="name" label="账号" />
       <el-table-column prop="address" label="用户名" />
       <el-table-column prop="address1" label="姓名" />
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index cc4041f..94f52ad 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -76,6 +76,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
+          @click="batchDelete"
         >
           删除
         </el-button>
@@ -91,9 +92,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      ref="multipleTable"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <!-- <el-table-column prop="index" label="序号" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="messageCode" label="消息编号" />
       <el-table-column prop="messageTitle" label="消息标题" />
       <el-table-column prop="messageContent" label="消息内容" />
@@ -106,6 +113,7 @@
           <el-button
             type="text"
             size="small"
+            @click="remove(scope.row)"
           >
             删除
           </el-button>
@@ -127,7 +135,7 @@
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage } from '../../api/move/message'
+import { listPage ,deleteBatch ,deleteInfo} from '../../api/move/message'
 export default { // 加入分页逻辑
   components: {
     MassageAddDialog,
@@ -184,6 +192,44 @@
       this.isShowAdd = true
       this.title = '消息推送编辑'
       this.$refs.addMessage.init(row)
+    },
+    // 批量删除
+    batchDelete(){
+      if(this.$refs.multipleTable.selection.length){
+        this.$confirm(`确认删除选中的这些数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+         //  得到选中行
+         const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            deleteBatch({ ids: ids }).then((res) => {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+              });
+              this.refresh();
+            });
+      }).catch(()=>{})
+      }else{
+        this.$message.error('请先选择需要删除的消息记录')
+      }
+    },
+    remove(row){
+      this.$confirm(`确认删除此项数据吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(()=>{
+        deleteInfo({id:row.id}).then(()=>{
+          this.$message.success('操作成功')
+          this.refresh();
+        })
+      }).catch(()=>{})
     }
   }
 }
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 0f26885..1c67bdb 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -35,7 +35,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="id" label="序号" />
+      <el-table-column type="index" label="序号" />
       <el-table-column prop="orderId" label="订单号" />
       <el-table-column prop="userName" label="下单人" />
       <el-table-column prop="userPhone" label="联系方式" />
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index ab6f457..514371a 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -403,11 +403,11 @@
     },
     valiateProduct() {
       // 验证产品列表
-      if (this.addInfo.productList.length) {
+      if (this.addInfo.productList.length && this.showEdit.every(item => item=== false)) {
         return true;
       } else {
         this.$message({
-          message: "产品列表不能为空",
+          message: "请先添加或保存产品信息",
           type: "error",
         });
         return false;
@@ -478,6 +478,7 @@
           }
         })
         row.productCode = this.addInfo.productList.productCode
+        
         row.brandName = this.brandName
         row.categoryIds = this.categoryIds
         row.productQuantity = this.addInfo.productList.productQuantity
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 2dfc80a..652300f 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -91,6 +91,11 @@
     >
       <el-table-column type="selection" width="55" />
       <!--      <el-table-column prop="index" width="75" label="序号" />-->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -284,7 +289,16 @@
       })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows)
+          res.rows = res.rows.map(item =>{
+            return{
+              编号:item.brandCode,
+              '名称':item.brandName,
+              性质:item.brandProperty,
+              品类:item.categoryStr,
+              供应商:item.supplierStr
+            }
+          })
+          outToExcel(res.rows,'品牌列表')
           loading.close() // 关闭加载动画
           this.$message({
             message: '导出成功',
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 8767f49..71ae178 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -82,7 +82,12 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" width="60" />
+      <!-- <el-table-column type="index" label="序号" width="60" /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index e1e9818..feb9245 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -93,6 +93,16 @@
         type="selection"
         width="55"
       />
+      <!-- <el-table-column
+        type="index"
+        width="55"
+        label="编号"
+      /> -->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column
         prop="snCode"
         label="SN码"
@@ -166,6 +176,7 @@
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
 import { SelectList } from '../../api/product/brand'
 import { exportFile } from '@/utils/exportutils'
+import { export_json_to_excel } from "../../utils/Export2Excel";
 export default {
   components: {
     DataInfoItem,
@@ -301,6 +312,46 @@
         fileName = fileName.replace(/-|:| /g, '')
         exportFile(blob, fileName)
       })
+      // d_listPage("offset=1", {}).then((res) => {
+      //   console.log(res.rows, "全部数据");
+        // 对数据进行加工
+        // res.rows = res.rows.map((item) => {
+        //   return {
+        //     产品名称: item.productName,
+        //     产品品牌: item.brandName,
+        //     产品型号: item.productCode,
+        //     产品品类: item.categoryStr,
+        //     产品颜色: item.productColor,
+        //     产品材质: item.productMaterialQuality,
+        //     产品状态: item.productStatus,
+        //     产品版本: item.productEdition,
+        //     规格: item.productPackageSize,
+        //     重量: item.productWeight,
+        //     国际69码: item.internationalCode,
+        //     更新时间: item.updateTime,
+        //   };
+        // });
+      //   this.ExportTable = res.rows;
+      //   const header = Object.keys(res.rows[0]);
+      //   console.log(header);
+      //   const data = res.rows.map((user, index) => {
+      //     const userArr = [];
+      //     console.log(user, index);
+      //     for (const key in res.rows[0]) {
+      //       // console.log(res.rows[key]);
+      //       const item = user[key];
+      //       userArr.push(item);
+      //     }
+      //     return userArr;
+      //   });
+      //   console.log(data);
+      //   // //把定义好的header和data放进export_json_to_excel的函数里作为参数
+      //   export_json_to_excel({
+      //     header,
+      //     data,
+      //     filename: "设备列表",
+      //   });
+      // });
     }
   }
 }
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index a84eeeb..f0bfbd1 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -73,8 +73,13 @@
         :header-cell-style="{ background: '#2483b3', color: 'white' }"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column type="index" label="编号" width="60" />
+        <!-- <el-table-column type="index" label="编号" width="60" /> -->
         <!--        <el-table-column header-align="center" align="center" prop="id" label="序号" />-->
+        <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
         <el-table-column
           header-align="center"
           align="center"
diff --git a/src/views/product/snCodeField.vue b/src/views/product/snCodeField.vue
index 14d8f18..8edeb97 100644
--- a/src/views/product/snCodeField.vue
+++ b/src/views/product/snCodeField.vue
@@ -80,6 +80,11 @@
     >
       <el-table-column type="selection" width="55" />
       <!--      <el-table-column prop="index" label="序号" />-->
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="snFixedId" label="SN码（固定标识）" />
       <el-table-column prop="snFixedIllustration" label="SN码（固定标识）说明" />
       <el-table-column prop="snStartCode" label="SN码（起始序列号）" />
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 2a7b833..9ce7755 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -79,6 +79,11 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
+      <el-table-column type="index" label="序号" >
+      <template slot-scope="scope">
+          {{ (offset - 1) * limit + scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column prop="snCode" label="SN码（固定标识）" />
       <el-table-column prop="snQuantity" label="SN码（固定标识）个数" />
       <el-table-column prop="snIllustration" label="SN码（固定标识）说明" />
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index 704d7c8..539116d 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -146,6 +146,7 @@
     tableRowClassName: tableRowClassName,
     closeAdd() {
       this.isShowAdd = false;
+      this.getListPage()
     },
 
     handleClick(row) {