2

src/components/coffeeManage/componemt/zc.vue

@@ -2,99 +2,105 @@
   <div>
     <el-dialog title="选择资产" :visible.sync="show" width="800px" :before-close="handleClose">
       <div class="search">
-        <el-input
-          v-model="msg.Name"
-          placeholder="请输入资产名称"
-          @keyup.native.enter="getData"
-          size="small"
-          style="margin-right:25px"
-        ></el-input>
+        <el-input v-model="msg.Name" placeholder="请输入资产名称" @keyup.native.enter="getData" size="small"
+          style="margin-right:25px"></el-input>
         <el-button type="primary" size="small" @click="getData">搜索</el-button>
       </div>
       <div>
         <el-table :data="tableData" style="width: 100%" height="50vh">
-          <el-table-column width="80" label="Id" align='center' fixed>
-              <template slot-scope="scope">
-                  <el-radio v-model="radio" :label="scope.row.Id"></el-radio>
-              </template>
-           </el-table-column>
-          <el-table-column prop="Name" label="名称" width="180" align='center'></el-table-column>
-          <el-table-column prop="SuppliesNum" label="资产编码" width="120" align='center'></el-table-column>
-          <el-table-column prop="CategoryName" label="分类" width="120" align='center'></el-table-column>
-          <el-table-column prop="BrandName" label="品牌" width="120" align='center'> </el-table-column>
-          <el-table-column prop="SuppliesModel" label="型号"  width="120" align='center'> </el-table-column>
-          <el-table-column prop="Units" label="单位"  width="80" align='center'> </el-table-column>
-          <el-table-column prop="Money" label="单价"  width="120" align='center'> </el-table-column>
-          <el-table-column prop="InventoryNum" label="库存"  width="80" align='center'></el-table-column>
+          <el-table-column width="80" label="Id" align="center" fixed>
+            <template slot-scope="scope">
+              <el-radio v-model="radio" :label="scope.row.Id"></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column prop="Name" label="名称" width="180" align="center"></el-table-column>
+          <el-table-column prop="SuppliesNum" label="资产编码" width="120" align="center"></el-table-column>
+          <el-table-column prop="CategoryName" label="分类" width="120" align="center"></el-table-column>
+          <el-table-column prop="BrandName" label="品牌" width="120" align="center">
+          </el-table-column>
+          <el-table-column prop="SuppliesModel" label="型号" width="120" align="center">
+          </el-table-column>
+          <el-table-column prop="Units" label="单位" width="80" align="center">
+          </el-table-column>
+          <el-table-column prop="Money" label="单价" width="120" align="center">
+          </el-table-column>
+          <el-table-column prop="InventoryNum" label="库存" width="80" align="center"></el-table-column>
         </el-table>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="close">取 消</el-button>
-        <el-button type="primary" @click="confirm"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="confirm">确 定</el-button>
       </span>
     </el-dialog>
   </div>
 </template>
 <script>
-export default {
-  model: {
-    prop: "show",
-    event: "change"
-  },
-  props: {
-    show: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      tableData: [],
-      radio:"",
-      msg: {
-        RB_Group_Id: 0,
-        Name: ""
+  export default {
+    model: {
+      prop: "show",
+      event: "change"
+    },
+    props: {
+      show: {
+        type: Boolean,
+        default: false
       }
-    };
-  },
-  methods: {
-    close() {
-      this.$emit("change", false);
     },
-    confirm(){
-        let res= this.tableData.find(e=>e.Id===this.radio)
-        if(res){
-             this.close()
-             this.$emit("confirm", res);
-        }else{
-            this.$message.error("请选择资产");
+    data() {
+      return {
+        tableData: [],
+        radio: "",
+        msg: {
+          RB_Group_Id: 0,
+          Name: ""
         }
+      };
     },
-    getData() {
-      if (!this.msg.Name) {
-        this.$message.error("请输入资产名称");
-        return;
+    methods: {
+      close() {
+        this.$emit("change", false);
+      },
+      confirm() {
+        let res = this.tableData.find(e => e.Id === this.radio);
+        if (res) {
+          const obj = JSON.parse(JSON.stringify(res));
+          obj.ImageList = obj.ImageList.map(e => {
+            e = "http://imgfile.oytour.com" + e;
+            return {
+              Path: e
+            };
+          });
+          this.close();
+          this.$emit("confirm", obj);
+        } else {
+          this.$message.error("请选择资产");
+        }
+      },
+      getData() {
+        if (!this.msg.Name) {
+          this.$message.error("请输入资产名称");
+          return;
+        }
+        this.i_post("/api/Property/GetEduGoodsMaterialList", this.msg, res => {
+          this.tableData = res.data.data;
+        });
+      },
+      handleClose(done) {
+        this.close();
       }
-      this.i_post("/api/Property/GetEduGoodsMaterialList", this.msg, res => {
-        this.tableData = res.data.data;
-      });
     },
-    handleClose(done) {
-         this.close()
-      }
-  },
-  mounted() {
-    let apiData = JSON.parse(localStorage.getItem("iframeData"));
-    this.msg.RB_Group_Id = apiData.GroupId;
-  }
-};
+    mounted() {
+      let apiData = JSON.parse(localStorage.getItem("iframeData"));
+      this.msg.RB_Group_Id = apiData.GroupId;
+    }
+  };
+
 </script>
 <style scoped>
-.search {
-  display: flex;
-  align-items: center;
-  flex-wrap: nowrap;
-}
+  .search {
+    display: flex;
+    align-items: center;
+    flex-wrap: nowrap;
+  }
+
 </style>

src/components/coffeeManage/edit.vue

@@ -33,9 +33,9 @@
                         <!-- <el-radio :label="3">教室类</el-radio> -->
                       </el-radio-group>
                       <div v-if="addMsg.GoodsEduType == 2">
-                        <el-button type="primary" @click="isShowZC=true" style="margin:0 10px;" size="mini">选择资产
+                        <el-button type="primary" @click="isShowZC=true" style="margin:0 10px;" size="mini" :disabled="addMsg.Id > 0">选择资产
                         </el-button>
-                        <span v-if="zcObj.Id">资产编号：{{zcObj.Id}}</span>
+                        <span v-if="addMsg.MaterialId">资产编号：{{addMsg.MaterialId}}</span>
                       </div>
                     </div>
                   </el-form-item>
@@ -1347,7 +1347,6 @@
           IsKorea: 0,
         }, //当前登录用户
         isShowZC: false,
-        zcObj: {}
       };
     },
     created() {
@@ -1882,10 +1881,10 @@
           if (valid) {
             let content = this.$refs.ue.getUEContent();
             this.addMsg.GoodsDetails = content;
-            // if (this.addMsg.CategoryList.length == 0) {
-            //   this.Error('请选择商品分类');
-            //   return false
-            // }
+            if (this.addMsg.CategoryList.length == 0) {
+              this.Error('请选择商品分类');
+              return false
+            }
             if (this.SpecificationList.length > 0) {
               this.addMsg.IsCustomSpecification = 1;
             }
@@ -2507,9 +2506,7 @@
         this.$router.go(-1);
       },
       confirmZC(val) {
-        console.log(val)
         if (val) {
-          this.zcObj = val
           this.addMsg.Name = val.Name
           this.addMsg.MaterialId = val.Id
           this.addMsg.CarouselImageList = val.ImageList
@@ -2538,7 +2535,7 @@
           Id: 0,
           EnabledImage: 2
         };
-        this.SpecificationList.push(obj);
+        this.SpecificationList[0]=obj;
       },
       // 添加规格值2
       addGgz2(item, index) {
@@ -2551,7 +2548,7 @@
               item.SpecificationValueList.length - 1
             ].Sort + 1 : item.SpecificationValueList.length + 1
         };
-        this.SpecificationList[index].SpecificationValueList.push(obj);
+        this.SpecificationList[index].SpecificationValueList[0]=obj;
       },
     }
   };

src/components/coffeeManage/orderList.vue

@@ -495,12 +495,12 @@
                       src="../../assets/img/userman/del.png" alt="" />
                   </el-tooltip>
                   <template v-if="msg.Recycled == 2">
-                    <el-tooltip class="item" effect="dark" content="打印小票" placement="top">
+                    <!-- <el-tooltip class="item" effect="dark" content="打印小票" placement="top">
                       <img class="app-order-icon" src="../../assets/img/userman/print.png" alt="" />
-                    </el-tooltip>
-                    <el-tooltip class="item" effect="dark" content="打印发货单" placement="top">
+                    </el-tooltip> -->
+                    <!-- <el-tooltip class="item" effect="dark" content="打印发货单" placement="top">
                       <img class="app-order-icon" src="../../assets/img/userman/invoice.png" alt="" />
-                    </el-tooltip>
+                    </el-tooltip> -->
                     <el-tooltip class="item" effect="dark" content="添加备注" placement="top">
                       <img @click="OrderExit(item, 1)" class="app-order-icon"
                         src="../../assets/img/userman/add_remark.png" alt="" />