Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/dispatch/modules/edit.vue

@@ -67,9 +67,14 @@
                 </el-table-column>
                 <el-table-column
                   label="操作"
-                  width="90">
+                  width="120">
                   <template slot-scope="scope">
-                    <el-button type="text" @click="(defaultData.re_info = scope.row,visible = false)" size="mini">选 择</el-button>
+                    <el-button class="inline-16" type="text" @click="(defaultData.re_info = scope.row,visible = false)" size="mini">选 择</el-button>
+                    <el-popconfirm
+                      title="确定删除吗？"
+                      @confirm="deleteContacts(scope.row)">
+                      <el-button class="inline-16" size="small" type="text" slot="reference">删 除</el-button>
+                    </el-popconfirm>
                   </template>
                 </el-table-column>
               </el-table>
@@ -190,7 +195,18 @@ export default {
       this.defaultData.freightstatus = this.data.freightstatus
       this.defaultData.remarks = this.data.remarks
     },
-
+    async deleteContacts (row) {
+      const res = await this.$api.requested({
+        "id": "20221009155903",
+        "version":1,
+        "content": {
+          "contactsid":row.contactsid
+        }
+      })
+      this.tool.showMessage(res,()=>{
+        this.receiveAddress()
+      })
+    },
    // 收货信息:合作企业联系人
    async receiveAddress () {
       this.addressparam.content.sys_enterpriseid = this.data.sys_enterpriseid