Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz

src/views/invoicing/components/invoicingDetail.vue

@@ -24,6 +24,11 @@
         </div>
         <div class="head-container">
             <el-table :data="tableData.list" v-loading="tableData.loading">
+                <el-table-column label="规格名称" prop="specSnap" v-if="goods.specSnap">
+                    <template v-slot="scope">
+                        <span v-if="scope.row.specSnap"> {{ scope.row.specSnap }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="类型">
                     <template v-slot="scope">
                         <el-tag type="info">{{ scope.row.type }}</el-tag>
@@ -134,6 +139,7 @@ export default {
         async show(obj) {
             this.dialogVisible = true
             this.goods = obj
+            console.log(obj)
             this.tbProductStockDetailSum()
             await this.getTableData()
         },

src/views/invoicing/components/operatingDetail.vue

@@ -33,6 +33,7 @@
 
 <script>
 import dayjs from 'dayjs'
+import { formatDecimal } from '@/utils/index.js'
 import { tbProductStockOperateDetail } from '@/api/invoicing'
 export default {
     data() {
@@ -54,12 +55,11 @@ export default {
     methods: {
         //返回现有库存数量
         returnNowHasNumbr(row) {
-            const subType=this.tableData.detail.subType||1
-            console.log(row)
-            if(!row.hasOwnProperty('number')){
+            const subType = this.tableData.detail.subType || 1
+            if (!row.hasOwnProperty('number')) {
                 return ''
             }
-            return row.stockNumber * 1 + row.number * subType + row.unitName
+            return formatDecimal(parseFloat(row.stockNumber * 1 + row.number * subType + row.unitName), 2, true)
         },
         show(row) {
             this.dialogVisible = true
@@ -72,7 +72,7 @@ export default {
                 const res = await tbProductStockOperateDetail(id)
                 this.tableData.loading = false
                 this.tableData.detail = res
-                
+
             } catch (error) {
                 console.log(error);
             }

src/views/invoicing/operation_in.vue

@@ -304,7 +304,6 @@ export default {
             this.inTabValue = value
             this.shopTypesActive = 0
             this.resetHandle()
-            this.queryForm.type = type
         },
         // 计算耗材总价
         consCountTotal(cvalue, row, key1, key2 = undefined) {
@@ -415,6 +414,11 @@ export default {
         resetHandle() {
             this.showResult = false
             this.queryForm = { ...this.resetForm }
+            if (this.inTabValue == 'goods') {
+                this.queryForm.type = this.shopTypes[this.shopTypesActive].value
+            } else {
+                this.queryForm.type = this.inTabs.find(item => item.value == this.inTabValue).type
+            }
             this.tableData.list = []
             this.$refs.queryForm.resetFields()
         },

src/views/invoicing/operation_out.vue

@@ -409,6 +409,11 @@ export default {
         resetHandle() {
             this.showResult = false
             this.queryForm = { ...this.resetForm }
+            if (this.inTabValue == 'goods') {
+                this.queryForm.type = this.shopTypes[this.shopTypesActive].value
+            } else {
+                this.queryForm.type = this.inTabs.find(item => item.value == this.inTabValue).type
+            }
             this.tableData.list = []
             this.$refs.queryForm.resetFields()
         },

src/views/product/add_shop.vue

@@ -16,6 +16,9 @@
       <el-form-item label="商品名称" prop="name">
         <el-input v-model="form.name" placeholder="请输入商品名称" style="width: 500px;"></el-input>
       </el-form-item>
+      <el-form-item label="商品介绍" prop="shortTitle">
+        <el-input v-model="form.shortTitle" type="textarea" placeholder="请输入商品介绍" style="width: 500px;"></el-input>
+      </el-form-item>
       <el-form-item label="单位" prop="unitId">
         <el-select v-model="form.unitId" placeholder="请选择单位" style="width: 500px;" @change="selectUnitt">
           <el-option :label="item.name" :value="item.id" v-for="item in units" :key="item.id"></el-option>
@@ -323,7 +326,7 @@
     <el-dialog title="批量修改" width="400px" :visible.sync="showBatchModal">
       <el-form :model="batchNumberForm">
         <el-form-item>
-          <el-input-number v-model="batchNumberForm.batchNumber" :min="0" controls-position="right"
+          <el-input-number @change="priceFormat(batchNumberForm,'batchNumber')" @blur="priceFormat(batchNumberForm,'batchNumber')" v-model="batchNumberForm.batchNumber"  controls-position="right"
             style="width: 100%;"></el-input-number>
         </el-form-item>
       </el-form>
@@ -402,6 +405,7 @@ export default {
         id: "",
         typeEnum: "normal",
         name: "",
+        shortTitle:"",//商品介绍
         unitId: "",
         unitName: "",
         categoryId: "", // 商品分类id
@@ -563,8 +567,14 @@ export default {
     },
     // 确认批量修改规格
     batchNumberFormConfirm() {
-      this.form.skuList.map(item => {
-        item[this.batchNumberKey] = this.batchNumberForm.batchNumber;
+      console.log(this.form.skuList)
+      this.form.skuList.map((item,index) => {
+        //解决vue2列表数据更新视图未变化问题
+        let newitem = {...item}
+        newitem[this.batchNumberKey] = this.batchNumberForm.batchNumber;
+
+        this.$set( this.form.skuList, index, {...newitem})
+        // item[this.batchNumberKey] = this.batchNumberForm.batchNumber;
       });
       this.showBatchModal = false;
       this.batchNumberForm.batchNumber = 0;

src/views/shop/components/addStaff.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog :title="title" :visible.sync="dialogVisible">
+    <el-dialog :title="title" :visible.sync="dialogVisible" @open="reset">
         <el-form ref="form" :model="form" :rules="rules" label-width="140px" label-position="left">
             <el-form-item label="员工姓名" prop="name">
                 <el-input v-model="form.name" placeholder="请输入员工姓名" />
@@ -7,16 +7,20 @@
             <el-form-item label="员工编号" prop="code">
                 <el-input v-model="form.code" placeholder="请输入员工编号" />
             </el-form-item>
-            <el-form-item label="员工账号" prop="account">
-                <el-input v-model="form.account" placeholder="请输入员工账号，建议使用手机号" />
-            </el-form-item>
             <el-form-item label="手机号" prop="phone">
                 <el-input v-model="form.phone" placeholder="请输入手机号" />
             </el-form-item>
-            <el-form-item label="最大优惠金额">
-                <el-input-number v-model="form.maxDiscountAmount" controls-position="right" :min="0"></el-input-number>
+            <el-form-item label="员工账号" prop="account">
+                <el-input v-model="form.account" placeholder="请输入员工账号，建议使用手机号" />
             </el-form-item>
-            <el-form-item label="角色">
+            <el-form-item label="登录密码">
+                <el-input type="password" v-model="form.password" placeholder="请输入登录密码，不填默认123456" />
+            </el-form-item>
+            <el-form-item label="最大优惠金额">
+                <el-input-number v-model="form.maxDiscountAmount" controls-position="right" :min="0"
+                    :max="100000"></el-input-number>
+            </el-form-item>
+            <el-form-item label="角色" prop="roleId">
                 <el-select v-model="form.roleId" placeholder="请选择角色">
                     <el-option :label="item.name" :value="item.id" v-for="item in roles" :key="item.id"></el-option>
                 </el-select>
@@ -55,7 +59,8 @@ export default {
                 isPc: 1,
                 isManage: 1,
                 roleId: '',
-                phone: ''
+                phone: '',
+                password: ''
             },
             resetForm: '',
             rules: {
@@ -91,7 +96,7 @@ export default {
                     {
                         required: true,
                         message: ' ',
-                        trigger: 'blur'
+                        trigger: 'change'
                     }
                 ],
                 phone: [
@@ -131,6 +136,7 @@ export default {
                             type: 'success'
                         });
                     } catch (error) {
+                        this.loading = false
                         console.log(error);
                     }
                 }