Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq

src/views/invoicing/consumable/information.vue

@@ -30,35 +30,40 @@
           <el-date-picker v-model="query.createdAt" type="daterange" range-separator="至" start-placeholder="开始日期"
             end-placeholder="结束日期" value-format="yyyy-MM-dd">
           </el-date-picker>
-          
+
           <el-button type="primary" @click="getTableData">查询</el-button>
           <el-button @click="resetHandle">重置</el-button>
         </div>
         <div class="row">
-          <el-button type="primary" icon="el-icon-plus" @click="clickdialogframe('add')">添加</el-button>
+          <!-- <el-button type="primary" icon="el-icon-plus" @click="clickdialogframe('add')">添加</el-button>
           <el-button @click="routerGo('operation_in')">入库</el-button>
           <el-button @click="routerGo('operation_out')">出库</el-button>
           <el-button @click="$router.push({ name: 'type' })">分类管理</el-button>
           <el-button @click="$router.push({ name: 'supplier_manage' })">供应商管理</el-button>
           <el-button icon="el-icon-download" :loading="downloadLoading" @click="protHandle">导出耗材</el-button>
-          <el-button icon="el-icon-upload2" :loading="uploadLoading" @click="dialogVisible = true">导入耗材</el-button>
+          <el-button icon="el-icon-upload2" :loading="uploadLoading" @click="dialogVisible = true">导入耗材</el-button> -->
-        </div>
+           <el-select clearable v-model="query.sort" @change="getTableData" placeholder="排序">
-      </div>
-      <div class="row_wrap" style="margin-top: 12px">
-        <div class="row">
-          <!-- <el-button type="primary" icon="el-icon-plus" @click="clickdialogframe('add')">添加</el-button>
-          <el-button @click="$router.push({ name: 'operation_in' })">入库</el-button>
-          <el-button @click="$router.push({ name: 'operation_out' })">出库</el-button>
-          <el-button @click="$router.push({ name: 'cons_record' })">耗材记录</el-button>
-          <el-button @click="$router.push({ name: 'type' })">分类管理</el-button>
-          <el-button @click="$router.push({ name: 'supplier_manage' })">供应商管理</el-button> -->
-        </div>
-        <div class="row">
-          <el-select clearable v-model="query.sort" @change="getTableData" placeholder="排序">
             <el-option label="创建时间" value="createTime,desc" />
             <el-option label="数量由低到高" value="balance,asc" />
           </el-select>
         </div>
+       
+      </div>
+      <div class="row_wrap" style="margin-top: 12px">
+        <div class="row">
+          <el-button type="primary" icon="el-icon-plus" @click="clickdialogframe('add')">添加</el-button>
+          <el-button @click="$router.push({ name: 'operation_in' })">入库</el-button>
+          <el-button @click="$router.push({ name: 'operation_out' })">出库</el-button>
+          <el-button @click="$router.push({ name: 'cons_record' })">耗材记录</el-button>
+          <el-button @click="$router.push({ name: 'type' })">分类管理</el-button>
+          <el-button @click="$router.push({ name: 'supplier_manage' })">供应商管理</el-button>
+        </div>
+        <!-- <div class="row">
+          <el-select clearable v-model="query.sort" @change="getTableData" placeholder="排序">
+            <el-option label="创建时间" value="createTime,desc" />
+            <el-option label="数量由低到高" value="balance,asc" />
+          </el-select>
+        </div> -->
       </div>
     </div>
     <template>
@@ -162,7 +167,8 @@
           <el-table-column label="原有库存" prop="balance">
             <template v-slot="scope">
               <span>{{ scope.row.balance > 0 ? (scope.row.balance + (scope.row.bizType == '-' ?
-                scope.row.amount : -scope.row.amount)) : Number(scope.row.balance) + Number(scope.row.amount) }}</span>
+                scope.row.amount : -scope.row.amount)).toFixed(2) : (Number(scope.row.balance) +
+                  Number(scope.row.amount)).toFixed(2) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="变动后库存" prop="balance"></el-table-column>
@@ -249,7 +255,7 @@
         <el-table-column label="耗材入库" prop="conIn" />
         <el-table-column label="耗材出库" prop="conOut" />
         <el-table-column label="耗材反还" prop="conReturn" />-->
-        
+
         <el-table-column label="所属商品">
           <template v-slot="scope">
             <div class="goodslang">
@@ -297,7 +303,7 @@
             <el-switch v-model="scope.row.isCheck" active-value="1" inactive-value="0"
               @change="showChange($event, scope.row)"></el-switch>
           </template>
-        </el-table-column> 
+        </el-table-column>
         <!-- <el-table-column label="状态" prop="status">
           <template v-slot="scope">
             <el-switch v-model="scope.row.status" active-value="1" inactive-value="0"
@@ -647,7 +653,7 @@ export default {
       tableDatatype: {
         data: [],
         page: 0,
-        size:100,
+        size: 100,
         loading: false,
         total: 0
       },
@@ -722,13 +728,13 @@ export default {
     this.getTableDatatype();
   },
   methods: {
-    async routerGo (name) {
+    async routerGo(name) {
       let text;
-      if ( name == 'operation_in') { text = "允许耗材入库"}
+      if (name == 'operation_in') { text = "允许耗材入库" }
-      if ( name == 'operation_out') { text = "允许耗材出库"}
+      if (name == 'operation_out') { text = "允许耗材出库" }
       let res = await hasPermission(text);
-      if ( !res) { return; }
+      if (!res) { return; }
-      this.$router.push({ name: name})
+      this.$router.push({ name: name })
     },
     lookDetail(row) {
       this.$refs.recodeDetail.open({

src/views/lineUp/basic.vue

@@ -203,8 +203,6 @@ export default {
                     this.tbShopInfo()
                 }
             } else {
-
-                console.log(this.forms.nearNum,'调试121')
                 const res = await callTabledataput({
                     shopId: localStorage.getItem("shopId"),
                     ...this.forms,
@@ -215,6 +213,7 @@ export default {
                     this.tbShopInfo()
                 }
             }
+            this.forms={}
         },
         // 获取用户详情
         async tbShopInfo() {

src/views/product/add_shop.vue

@@ -362,10 +362,10 @@
           <el-input-number @change="priceFormat(form, 'stockNumber')" @blur="priceFormat(form, 'stockNumber')"
             v-model="form.stockNumber" controls-position="right"></el-input-number>
         </el-form-item>
-        <el-form-item label="标签打印">
+        <!-- <el-form-item label="标签打印">
           <el-switch v-model="form.enableLabel" :active-value="1" :inactive-value="0"></el-switch>
           <div class="tips">开启后: 收银完成后会自动打印对应数量的标签数</div>
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="打包费">
           <el-input-number @change="priceFormat(form, 'packFee')" @blur="priceFormat(form, 'packFee')"
             v-model="form.packFee" controls-position="right"></el-input-number>
@@ -774,7 +774,7 @@ export default {
         });
         return false;
       }
-      
+
       let arr = [];
       this.imgList.forEach((ele) => {
         arr.push(ele.url);