Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/data/components/addInspection.vue

@@ -49,9 +49,9 @@
                     <el-select v-model="form.project_detail" filterable placeholder="请选择" @change="changeProject">
                         <el-option
                                 v-for="item in projectList"
-                                :key="item.id"
+                                :key="item.new_id"
                                 :label="item.project_name"
-                                :value="item.id">
+                                :value="item.new_id">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -257,7 +257,8 @@
                 project_name: projectList[i].project_name,
                 unit: projectList[i].unit,
                 price: projectList[i].price,
-                type: 2
+                type: 2,
+                new_id: Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1))
               }
               this.projectList.push(obj)
 
@@ -271,7 +272,9 @@
                 project_name: goodInfos[i].good_name,
                 unit: goodInfos[i].good_unit,
                 price: goodInfos[i].retail_price,
-                type: 3
+                type: 3,
+                new_id: Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1))
+
               }
               this.projectList.push(obj)
             }
@@ -309,7 +312,7 @@
       addProjectList() {
         console.log(this.projectList)
         for (let i = 0; i < this.projectList.length; i++) {
-          if (this.form.project_detail == this.projectList[i].id) {
+          if (this.form.project_detail == this.projectList[i].new_id) {
             this.projectList[i].number = this.form.number
             this.projectList[i].number = this.projectList[i].number.toString()
             this.tableData.push(this.projectList[i])

src/xt_pages/data/components/editInspection.vue

@@ -50,7 +50,7 @@
                                 v-for="item,index in projectList"
                                 :key="index"
                                 :label="item.project_name"
-                                :value="item.id">
+                                :value="item.new_id">
                         </el-option>
                     </el-select>
 
@@ -209,7 +209,9 @@
                 unit: projectList[i].unit,
                 price: projectList[i].price,
                 type: 2,
-                m_id: 0
+                m_id: 0,
+                new_id: Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1))
+
               }
               this.projectList.push(obj)
 
@@ -224,7 +226,9 @@
                 unit: goodInfos[i].good_unit,
                 price: goodInfos[i].retail_price,
                 type: 3,
-                m_id: 0
+                m_id: 0,
+                new_id: Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1))
+
 
               }
               this.projectList.push(obj)
@@ -336,7 +340,7 @@
       },
       addProjectList() {
         for (let i = 0; i < this.projectList.length; i++) {
-          if (this.form.project_detail == this.projectList[i].id) {
+          if (this.form.project_detail == this.projectList[i].new_id) {
             this.projectList[i].number = this.form.number
             this.projectList[i].number = this.projectList[i].number.toString()
             this.tableData.push(this.projectList[i])