Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue

src/api/repair/other/index.js

@@ -27,3 +27,10 @@ export function deleteOther(id){
     method: "delete"
   })
 }
+
+export function getOtherByName(name){
+  return request({
+    url: preUrl + "/getByName?name=" + name,
+    method: "get"
+  })
+}

src/api/repair/project/index.js

@@ -51,3 +51,10 @@ export function exportRepairProjectExcel(params) {
     responseType: 'blob'
   })
 }
+
+export function getProjectByName(name){
+  return request({
+    url: "/repair/project/getByName?name=" + name,
+    method: "get",
+  })
+}

src/api/repair/wares/index.js

@@ -43,3 +43,10 @@ export function getWaresPage(params) {
   })
 }
 
+export function getWaresByName(name){
+  return request({
+    url: "/repair/wares/getByName?name=" + name,
+    method: "get"
+  })
+}
+

src/views/repair/other/OtherForm.vue

@@ -45,7 +45,7 @@ export default {
       try {
         await updateOther(this.formData)
         this.$modal.msgSuccess(this.formData.id ? "修改成功" : "新增成功")
-        this.$emit("success")
+        this.$emit("success", this.formData.name)
       } finally {
         this.dialogVisible = false
         this.formLoading = false

src/views/repair/project/form/RepairProjectForm.vue

@@ -18,12 +18,12 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="成本" prop="cost">
-              <el-input-number v-model="formData.cost" :precision="2" :step="0.1" :max="10"></el-input-number>
+              <el-input-number v-model="formData.cost" :precision="2" :step="0.1" ></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="售价" prop="price">
-              <el-input-number v-model="formData.price" :precision="2" :step="0.1" :max="10"></el-input-number>
+              <el-input-number v-model="formData.price" :precision="2" :step="0.1"></el-input-number>
             </el-form-item>
           </el-col>
         </el-row>
@@ -204,7 +204,7 @@ export default {
         const res = await RepairProjectApi.createRepairProject(data);
         this.$modal.msgSuccess("新增成功");
         this.dialogVisible = false;
-        this.$emit('success',res.data);
+        this.$emit('success', this.formData.name);
       } finally {
         this.formLoading = false;
       }

src/views/repair/tickets/Components/TicketItem.vue

@@ -21,14 +21,14 @@
           <span class="item__txt">{{ scope.row.name ? scope.row.name : scope.row.goods }}</span>
         </div>
       </el-table-column>
-<!--      <el-table-column align="center" label="使用权益" width="200" prop="coupon">-->
+      <!--      <el-table-column align="center" label="使用权益" width="200" prop="coupon">-->
-<!--        <div class="item" slot-scope="scope">-->
+      <!--        <div class="item" slot-scope="scope">-->
-<!--          <el-select class="item__input" v-model="scope.row.coupon.id" clearable filterable @blur="save(scope.row)">-->
+      <!--          <el-select class="item__input" v-model="scope.row.coupon.id" clearable filterable @blur="save(scope.row)">-->
-<!--            <el-option v-for="coupon in couponList" :key="coupon.id" :label="coupon.couponName" :value="coupon.id" />-->
+      <!--            <el-option v-for="coupon in couponList" :key="coupon.id" :label="coupon.couponName" :value="coupon.id" />-->
-<!--          </el-select>-->
+      <!--          </el-select>-->
-<!--          <span class="item__txt">{{ get }}</span>-->
+      <!--          <span class="item__txt">{{ get }}</span>-->
-<!--        </div>-->
+      <!--        </div>-->
-<!--      </el-table-column>-->
+      <!--      </el-table-column>-->
       <el-table-column align="center" label="规格" width="180" prop="model"/>
       <el-table-column align="center" label="编码" width="180" prop="code"/>
       <el-table-column align="center" label="数量" width="180" prop="count">
@@ -113,7 +113,7 @@
     </el-table>
 
     <WaresForm ref="partFormRef" class="noPadding" @success="returnPart"/>
-    <RepairProjectForm class="noPadding" ref="projectFormRef"  @success="returnProject"/>
+    <RepairProjectForm class="noPadding" ref="projectFormRef" @success="returnProject"/>
     <OtherForm ref="otherFormRef" class="noPadding" @success="returnOther"/>
   </div>
 </template>
@@ -128,6 +128,10 @@ import RepairProjectForm from "@/views/repair/project/form/RepairProjectForm.vue
 import ProjectChoose from "@/views/repair/Components/ProjectChoose.vue";
 import OtherChoose from "@/views/repair/Components/OtherChoose.vue";
 import OtherForm from "@/views/repair/other/OtherForm.vue";
+import request from "@/utils/request";
+import {getOtherByName} from "@/api/repair/other";
+import {getProjectByName} from "@/api/repair/project";
+import {getWaresByName} from "@/api/repair/wares";
 
 export default {
   name: "TicketItem",
@@ -141,14 +145,18 @@ export default {
       default: 'project',
       required: true
     },
-    inListData:{
+    inListData: {
-      type:Array,
+      type: Array,
-      default: () => {return []},
+      default: () => {
+        return []
+      },
       required: false
     },
     couponList: {
       type: Array,
-      default: () => {return []},
+      default: () => {
+        return []
+      },
       required: false
     }
   },
@@ -156,7 +164,7 @@ export default {
     return {
       loading: false,
       list: [{
-        coupon:{
+        coupon: {
           id: null
         }
       }],
@@ -177,14 +185,14 @@ export default {
       handler(val) {
         this.$emit("tableData", val)
         const coupons = val.filter(item => item.coupon).map(item => item.coupon)
-        if (coupons && coupons.length > 0){
+        if (coupons && coupons.length > 0) {
           this.$emit("changeCoupon", coupons)
         }
       },
       deep: true
     },
-    inListData(val){
+    inListData(val) {
-      if (val && val.length > 0){
+      if (val && val.length > 0) {
         // console.log(val)
         // this.list = val.map(item => {
         //   return {
@@ -333,17 +341,45 @@ export default {
           break
       }
     },
-    returnProject(row) {
+    async returnProject(name) {
-      // this.list.push(row)
+      const res = await getProjectByName(name)
-
+      const data = res.data
-    },
+      if (data) {
-    returnPart(row) {
+        this.list.splice(this.list.length - 1, 0, {
+          ...data,
+          count: 1,
+          totalPrice: data.price,
+          type: null
+        })
+      }
       // this.list.push(row)
     },
-    returnOther() {
+    async returnPart(name) {
-
+      const res = await getWaresByName(name)
+      const data = res.data
+      if (data) {
+        this.list.splice(this.list.length - 1, 0, {
+          ...data,
+          count: 1,
+          totalPrice: data.price,
+          type: null
+        })
+      }
+      // this.list.push(row)
     },
-    getCouponName(id){
+    async returnOther(name) {
+      const res = await getOtherByName(name)
+      const data = res.data
+      if (data) {
+        this.list.splice(this.list.length - 1, 0, {
+          ...data,
+          count: 1,
+          totalPrice: data.price,
+          type: null
+        })
+      }
+    },
+    getCouponName(id) {
       // this.
     }
   }

src/views/repair/wares/WaresForm.vue

@@ -55,7 +55,7 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="销售价格" prop="price">
-                  <el-input-number v-model="formData.price" :precision="2" :step="0.1" :max="10"></el-input-number>
+                  <el-input-number v-model="formData.price" :precision="2" :step="0.1" ></el-input-number>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -73,12 +73,12 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="最低库存" prop="miniStock">
-                  <el-input-number v-model="formData.miniStock" :max="10"></el-input-number>
+                  <el-input-number v-model="formData.miniStock"></el-input-number>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="最高库存" prop="maxStock">
-                  <el-input-number v-model="formData.maxStock" :max="10"></el-input-number>
+                  <el-input-number v-model="formData.maxStock"></el-input-number>
                 </el-form-item>
               </el-col>
 
@@ -86,7 +86,7 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="当前库存" prop="stock">
-                  <el-input-number v-model="formData.stock" :max="10"></el-input-number>
+                  <el-input-number v-model="formData.stock"></el-input-number>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -297,7 +297,7 @@ export default {
         const res = await WaresApi.createWares(data);
         this.$modal.msgSuccess("新增成功");
         this.dialogVisible = false;
-        this.$emit('success',res.data);
+        this.$emit('success',this.formData.name);
       } finally {
         this.formLoading = false;
       }