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

src/views/collect/CollectOrderAllotComponents.vue

@@ -94,10 +94,10 @@
           >查询
           </el-button
           >
-          <el-button type="primary" icon="el-icon-position" @click="bindWorkPlace"
-          >绑定工位
-          </el-button
-          >
+          <!--<el-button type="primary" icon="el-icon-position" @click="bindWorkPlace"-->
+          <!--&gt;绑定工位-->
+          <!--</el-button-->
+          <!--&gt;-->
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
@@ -236,7 +236,7 @@
       append-to-body
     >
       <bindWorkDialog
-        :prescribeList="this.multiplePreSelection"
+        :prescribeListData="this.prescribeListData"
         :closeDialog="this.closeDialog"
       ></bindWorkDialog>
     </el-dialog>
@@ -325,6 +325,7 @@ export default {
 
       bindWorkPlaceVisible: false,
       multiplePreSelection: [],
+      prescribeListData: {},
       curRow: null,
       panelALive: false,
 
@@ -374,12 +375,13 @@ export default {
       this.getList();
     },
 
-    bindWorkPlace() {
-      if (this.multiplePreSelection.length == 0) {
-        this.$message.warning('请先选择处方!');
-        return
-      }
-      this.bindWorkPlaceVisible = true;
+    bindWorkPlace(_this,row) {
+      // if (this.multiplePreSelection.length == 0) {
+      //   this.$message.warning('请先选择处方!');
+      //   return
+      // }
+      _this.prescribeListData = row
+      _this.bindWorkPlaceVisible = true;
 
     },
 

src/views/collect/bindWorkDialog.vue

@@ -59,7 +59,7 @@ import {bindWork} from "@/api/basic/sicker/prescribeApi";
 export default {
   name: "bindWorkDialog",
   props: {
-    prescribeList: {
+    prescribeListData: {
       type: Object,
       required: true,
     },
@@ -201,12 +201,12 @@ export default {
 
     bindWork() {
       let query = {
-        prescribeList: this.prescribeList,
+        prescribeListData: this.prescribeListData,
         workplaceCode: this.currentRow.workplaceId
       }
       bindWork(query).then(res => {
         if (res.code != 20000) {
-          this.$message.error('删除错误')
+          this.$message.error(res.message)
         } else {
           this.$message.success(res.data)
           this.closeDialog();