yangg 1 éve
szülő
commit
e8f807667d

+ 3 - 3
manager-admin/src/components/SkuEditor/src/helper.js

@@ -21,7 +21,7 @@ export const defaultParams = [
     required: true,
     batch: true
   },
- {
+ /*{
     key: 'bar_code',
     name: '条码',
     // value: 0,
@@ -29,7 +29,7 @@ export const defaultParams = [
     required: true,
     batch: true
   },
-  /*  {
+    {
     key: 'sn_code',
     name: '序列号',
     // value: 0,
@@ -208,7 +208,7 @@ export const makeTableForm = (selectedSpecs, params, skuList, haveSpec,hire_or_s
     if(hire_or_sail=="sail" && param.name!=='日租金'){
        return tableHead.push(param)
     }else{
-      let arr1=['sku','日租金','条码','序列号','单位']
+      let arr1=['sku','日租金','序列号','单位']
       arr1.map(el=>{
         el==param.name? tableHead.push(param):''
       })

+ 1 - 1
manager-admin/src/views/basicSetting/goods/index.vue

@@ -102,7 +102,7 @@
               class="toolbar-search"
               style="display: flex; align-items: center"
             >
-              <span>商品编号/条码/序列号:</span>
+              <span>商品编号/sku/序列号:</span>
               <en-table-search
                 @search="searchEvent"
                 placeholder="请输入关键字搜索"

+ 3 - 3
manager-admin/src/views/basicSetting/productClassAdd.vue

@@ -37,9 +37,9 @@
                                 {{ scope.row.goods_vo.name }}
                             </template>
                         </el-table-column>
-                        <el-table-column label="条码">
+                        <el-table-column label="SKU">
                             <template slot-scope="scope">
-                                {{ scope.row.bar_code }}
+                                {{ scope.row.sku }}
                             </template>
                         </el-table-column>
                         <!--      <el-table-column label="序列号">
@@ -77,7 +77,7 @@
                 @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55" />
                 <el-table-column prop="goods_vo.sn" label="商品编号"> </el-table-column>
-                <el-table-column prop="bar_code" label="商品条码"> </el-table-column>
+                <el-table-column prop="sku" label="sku"> </el-table-column>
                 <el-table-column prop="sn_code" label="序列号"> </el-table-column>
                 <el-table-column prop="goods_vo.name" label="商品名称"> </el-table-column>
                 <el-table-column prop="spec_name" label="规格型号">

+ 2 - 2
manager-admin/src/views/basicSetting/skuSort.vue

@@ -33,9 +33,9 @@
           <template slot-scope="scope">{{ scope.row.sku }}</template>
         </el-table-column>
         <el-table-column prop="spec_name" label="规格型号" />
-        <el-table-column label="条码" align="center">
+        <!-- <el-table-column label="条码" align="center">
           <template slot-scope="scope">{{ scope.row.bar_code }}</template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="sort" label="排序号" />
       </template>
 

+ 6 - 6
manager-admin/src/views/setting/serialList.vue

@@ -4,9 +4,9 @@
       <el-form ref="advancedForm" :model="advancedForm" label-width="160px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="商品条码">
+            <el-form-item label="sku">
               <el-input
-                v-model="advancedForm.sn"
+                v-model="advancedForm.sku"
                 placeholder="请输入内容"
                 clearable
               ></el-input>
@@ -136,7 +136,7 @@
       @close="close"
     >
       <div class="header">
-        <span>商品编号/条码</span>
+        <span>商品编号/sku</span>
         <el-input v-model="stockForm.sn"></el-input>
         <el-button>搜索</el-button>
       </div>
@@ -153,12 +153,12 @@
           </el-table-column>
           <el-table-column prop="goods_vo.name" label="商品名称" />
           <el-table-column
-            prop="bar_code"
-            label="商品条码"
+            prop="sku"
+            label="sku"
             v-if="title !== '查看序列号'"
           >
           </el-table-column>
-          <el-table-column prop="product_vo.bar_code" label="商品条码" v-else>
+          <el-table-column prop="product_vo.sku" label="sku" v-else>
           </el-table-column>
           <el-table-column
             prop="spec_name"

+ 5 - 5
manager-admin/src/views/stock/goodsExchange/addInventory.vue

@@ -51,10 +51,10 @@
                 {{ scope.row.goods_vo.name }}
               </template>
             </el-table-column>
-            <el-table-column label="条码">
+            <el-table-column label="sku">
               <template slot-scope="scope">
-                <span v-if="id">{{ scope.row.product_vo.bar_code }}</span>
-                <span v-else>{{ scope.row.product_vo.bar_code }}</span>
+                <span v-if="id">{{ scope.row.product_vo.sku }}</span>
+                <span v-else>{{ scope.row.product_vo.sku }}</span>
               </template>
             </el-table-column>
             <el-table-column label="序列号">
@@ -153,7 +153,7 @@
     <el-dialog title="扫码入库" :visible.sync="scanDialogVisible" width="30%" :close-on-click-modal="false">
       <el-form ref="scanGoodsForm" :model="scanGoodsForm" label-width="120px" inline>
         <!-- @blur="blurCode()" -->
-        <el-form-item label="条码" prop="bar_code">
+        <el-form-item label="sku" prop="bar_code">
           <el-input v-model="scanGoodsForm.bar_code" ref="input" @keyup.enter.native="toSearch()" :minlength="0"
             :maxlength="100"></el-input>
         </el-form-item>
@@ -171,7 +171,7 @@
             {{ scope.row.goods_vo.sn }}
           </template>
         </el-table-column>
-        <el-table-column prop="product_vo.bar_code" label="商品条码">
+        <el-table-column prop="product_vo.sku" label="sku">
         </el-table-column>
         <!-- <el-table-column prop="" label="序列号"></el-table-column> -->
         <el-table-column prop="" label="商品名称">

+ 3 - 3
manager-admin/src/views/stock/goodsExchange/checkInventory.vue

@@ -70,11 +70,11 @@
                   {{ scope.row.goods_vo.name }}
                 </template>
               </el-table-column>
-              <el-table-column label="条码">
+              <el-table-column label="sku">
                 <template slot-scope="scope">
                   <!-- {{ scope.row.bar_code }} -->
-                  <span v-if="id">{{ scope.row.product_vo.bar_code }}</span>
-                  <span v-else>{{ scope.row.bar_code }}</span>
+                  <span v-if="id">{{ scope.row.product_vo.sku }}</span>
+                  <span v-else>{{ scope.row.sku }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="序列号">

+ 4 - 4
manager-admin/src/views/stock/goodsExchange/goodsExchangeAdd.vue

@@ -165,10 +165,10 @@
                 <span v-else>{{ scope.row.goods_vo.name }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="条码">
+            <el-table-column label="sku">
               <template slot-scope="scope">
-                <span v-if="id">{{ scope.row.product_vo.bar_code }}</span>
-                <span v-else>{{ scope.row.product_vo.bar_code }}</span>
+                <span v-if="id">{{ scope.row.product_vo.sku }}</span>
+                <span v-else>{{ scope.row.product_vo.sku }}</span>
               </template>
             </el-table-column>
             <el-table-column label="序列号" v-if="sn_code_list">
@@ -299,7 +299,7 @@
         label-width="120px"
         inline
       >
-        <el-form-item label="条码" prop="bar_code">
+        <el-form-item label="sku" prop="bar_code">
           <el-input
             v-model="scanGoodsForm.bar_code"
             ref="input"

+ 3 - 3
manager-admin/src/views/stock/goodsInventory/goodsInventory.vue

@@ -85,9 +85,9 @@
           <template slot-scope="scope">
             <el-button  size="mini"
               @click="handleCheckGoodsInventory(scope.row)">查看</el-button>
-               <!--<el-button type="mini"
-              size="mini" v-if="scope.row.status=='NOT_HANDLE'" @click="handleSubmitGoodsInventory(scope.row)">处理</el-button>
-            <el-button v-if="scope.row.allowable.allow_audit && checkPermission(['goodsInventory:audit'])" type="mini"
+              <el-button type="mini"
+              size="mini" v-if="scope.row.status=='NOT_HANDLE'" @click="handleSubmitGoodsInventory(scope.row)">同步</el-button>
+            <!-- <el-button v-if="scope.row.allowable.allow_audit && checkPermission(['goodsInventory:audit'])" type="mini"
               size="mini" @click="handleAuditGoodsInventory(scope.row)">审核</el-button>
 
             <el-button v-if="scope.row.allowable.allow_cancel && checkPermission(['goodsInventory:cancel'])" type="mini"

+ 3 - 3
manager-admin/src/views/stock/goodsInventory/goodsInventoryAdd.vue

@@ -64,10 +64,10 @@
                 <span v-else>{{ scope.row.goods_vo.name }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="条码">
+            <el-table-column label="sku">
               <template slot-scope="scope">
-                <span v-if="!id"> {{ scope.row.product_vo.bar_code }}</span>
-              <span v-else> {{ scope.row.product_vo.bar_code }}</span>
+                <span v-if="!id"> {{ scope.row.product_vo.sku }}</span>
+              <span v-else> {{ scope.row.product_vo.sku }}</span>
               </template>
             </el-table-column>
             <el-table-column label="序列号">

+ 6 - 4
manager-admin/src/views/stock/goodsLend.vue

@@ -122,8 +122,9 @@
             statusFilter(scope.row.type)
           }}</template>
         </el-table-column>
-        <el-table-column prop="intro" label="库位说明" />
-        <!-- <el-table-column prop="lend_person" label="借出人" />
+        <el-table-column prop="" label="已绑定SKU数" />
+         <!-- <el-table-column prop="intro" label="库位说明" />
+       <el-table-column prop="lend_person" label="借出人" />
         <el-table-column prop="status" label="状态">
           <template slot-scope="scope">{{ statusFilter(scope.row.status) }}</template>
         </el-table-column> -->
@@ -139,7 +140,7 @@
               size="mini"
               v-if="checkPermission(['goodsLend:edit'])"
               @click="AddGoodsLend(scope.row)"
-              >添加商品</el-button
+              >绑定商品</el-button
             >
             <el-button
               size="mini"
@@ -150,6 +151,7 @@
             <el-button
               type="success"
               size="mini"
+              style="margin-top: 5px;"
               v-if="checkPermission(['goodsLend:del'])"
               @click="handleReturnGoodsLend(scope.row)"
               >删除</el-button
@@ -197,7 +199,7 @@
         <div class="tips-t" v-for="(item, index) in codeList" :key="index">
           <div>
             <!-- <div class="qrcode-pic" ref="codeItem" ></div> -->
-            <barcode :value="item"  format="CODE128" fontSize="20"></barcode>
+            <barcode :value="item" height="20"  format="CODE128" fontSize="20"></barcode>
            <!--  <h1
               class="qrcode-title"
               style="

+ 2 - 2
manager-admin/src/views/stock/goodsLendAdd.vue

@@ -55,9 +55,9 @@
                 {{ scope.row.product_name }}
               </template>
             </el-table-column>
-            <el-table-column label="条码">
+            <el-table-column label="sku">
               <template slot-scope="scope">
-                {{ scope.row.bar_code }}
+                {{ scope.row.sku }}
               </template>
             </el-table-column>
             <el-table-column label="序列号">

+ 1 - 1
manager-admin/src/views/stock/goodsTransfer.vue

@@ -11,7 +11,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="商品编号/条码/序列号">
+            <el-form-item label="商品编号/sku/序列号">
               <el-input v-model="advancedForm.input" placeholder="请输入内容" width="200px"></el-input>
             </el-form-item>
           </el-col>

+ 2 - 2
manager-admin/src/views/stock/goodsTransferAdd.vue

@@ -56,9 +56,9 @@
               {{ scope.row.goods_sn }}
             </template>
           </el-table-column>
-          <el-table-column label="商品条码">
+          <el-table-column label="sku">
             <template slot-scope="scope">
-              {{ scope.row.goods_bar_code }}
+              {{ scope.row.goods_sku }}
             </template>
           </el-table-column>
           <el-table-column label="序列号">

+ 3 - 3
manager-admin/src/views/stock/goodsUnderstockAdd.vue

@@ -111,10 +111,10 @@
               <span v-else>{{ scope.row.goods_vo.name }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="条码">
+          <el-table-column label="sku">
             <template slot-scope="scope">
-              <span v-if="!id"> {{ scope.row.product_vo.bar_code }}</span>
-              <span v-else> {{ scope.row.product_vo.bar_code }}</span>
+              <span v-if="!id"> {{ scope.row.product_vo.sku }}</span>
+              <span v-else> {{ scope.row.product_vo.sku }}</span>
             </template>
           </el-table-column>
           <el-table-column label="序列号">

+ 8 - 9
manager-admin/src/views/stock/inventoryItem.vue

@@ -12,7 +12,7 @@
         <h3>当前库位: {{ code }}</h3>
       </div>
       <div class="mx">
-        <h3>商品明细</h3>
+        <h3>绑定商品</h3>
         <el-button
           class="button"
           size="mini"
@@ -42,18 +42,17 @@
               {{ scope.row.goods_vo.name }}
               </template>
             </el-table-column>
-            <el-table-column label="条码">
+            <el-table-column label="sku">
               <template slot-scope="scope">
-
-             {{ scope.row.product_vo.bar_code }}
+             {{ scope.row.product_vo.sku }}
               </template>
             </el-table-column>
-            <el-table-column label="序列号">
+            <!-- <el-table-column label="序列号">
               <template slot-scope="scope">
 
                 {{ scope.row.product_vo.sn_code }}
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column prop="product_vo.spec_name" label="规格型号" v-if="id">
               <!-- <template slot-scope="scope">
                 {{ scope.row.product_vo.spec_name.join("/") }}
@@ -80,11 +79,11 @@
                 ></el-input>
               </template>
             </el-table-column> -->
-            <el-table-column label="库存数量">
+          <!--   <el-table-column label="库存数量">
               <template slot-scope="scope">
                 {{ scope.row.usable_stock }}
               </template>
-            </el-table-column>
+            </el-table-column> -->
           <!--   <el-table-column label="剩余数量">
               <template slot-scope="scope">
                 {{ scope.row.usable_stock - scope.row.out_num || 0 }}
@@ -142,7 +141,7 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column prop="goods_vo.sn" label="商品编号"> </el-table-column>
-        <el-table-column prop="product_vo.bar_code" label="商品条码"> </el-table-column>
+        <el-table-column prop="product_vo.sku" label="sku"> </el-table-column>
         <el-table-column prop="product_vo.sn_code" label="序列号"> </el-table-column>
         <el-table-column prop="goods_vo.name" label="商品名称"> </el-table-column>
         <el-table-column prop="product_vo.spec_name" label="规格型号">

+ 79 - 42
manager-admin/src/views/stock/orderAdd.vue

@@ -34,8 +34,26 @@
         </el-col>
         <el-col :span="10">
           <el-form-item label="起始时间:" prop="time" :rules="rules.start_time" v-if="OrderForm.type == 'TO_C'">
-            <el-date-picker v-model="OrderForm.start_time" type="datetime" placeholder="选择日期时间"
+            <!-- <el-date-picker v-model="OrderForm.start_time" type="datetime" placeholder="选择日期时间"
               :disabled="type == 'pone'" :picker-options="pickerOptions" value-format="yyyy-MM-dd HH:mm:ss">
+            </el-date-picker> -->
+
+            <el-date-picker v-model="time" type="daterange" align="center" @change='timeChange' :editable="false"
+              unlink-panels :clearable="false" :default-time="['00:00:00', '23:59:59']" range-separator="-"
+              start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd hh:mm:ss" :picker-options="{
+                disabledDate(time) {
+                  return (
+                    time.getTime() <=
+                    new Date(
+                      new Date().getFullYear(),
+                      new Date().getMonth(),
+                      new Date().getDate()
+                    ).getTime() -
+                    86400000
+                  );
+                },
+                shortcuts: MixinPickerShortcuts,
+              }">
             </el-date-picker>
           </el-form-item>
         </el-col>
@@ -46,25 +64,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="10">
-          <el-form-item label="应付金额:" prop="pay_price" :rules="rules.pay_price">
-            <span>{{ "¥" + price }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="折扣:" prop="">
-            <el-input placeholder="请输入" v-model="discount" @blur="handleBlur" :disabled="type == 'pone'"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="实付金额:" prop="real_price" :rules="rules.pay_price">
-            <!-- @input="validateNumber" 
-            <span>折扣:
-            </span>
-            <span>折后金额:</span>-->
-            <el-input v-model="OrderForm.real_price" placeholder="请输入" :disabled="type == 'pone'"></el-input>
-          </el-form-item>
-        </el-col>
         <el-col :span="10">
           <el-form-item label="销售人员:" prop="marketing_id" :rules="rules.marketing_id">
             <el-select v-model="OrderForm.marketing_id" clearable :disabled="type == 'pone'">
@@ -95,8 +94,7 @@
         </el-col>
         <el-col :span="10">
           <el-form-item label="返回仓库:" prop="return_warehouse_id" :rules="rules.return_warehouse_id">
-            <el-select v-model="OrderForm.return_warehouse_id" clearable
-              :disabled="type == 'pone'">
+            <el-select v-model="OrderForm.return_warehouse_id" clearable :disabled="type == 'pone'">
               <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
@@ -139,8 +137,7 @@
           <el-table-column type="selection" width="40" align="center" />
           <el-table-column label="图标">
             <template slot-scope="scope">
-              <img :src="scope.row.goods_vo.image_small_list" alt="" width="50px"
-                >
+              <img :src="scope.row.goods_vo.image_small_list" alt="" width="50px">
             </template>
           </el-table-column>
           <el-table-column label="仓库名称">
@@ -158,10 +155,10 @@
               {{ scope.row.goods_vo.name }}
             </template>
           </el-table-column>
-          <el-table-column label="条码">
+          <el-table-column label="sku">
             <template slot-scope="scope">
-              <span v-if="!id"> {{ scope.row.product_vo.bar_code }}</span>
-              <span v-else> {{ scope.row.product_vo.bar_code }}</span>
+              <span v-if="!id"> {{ scope.row.product_vo.sku }}</span>
+              <span v-else> {{ scope.row.product_vo.sku }}</span>
             </template>
           </el-table-column>
           <el-table-column label="序列号">
@@ -192,13 +189,18 @@
               {{ scope.row.usable_stock }}
             </template>
           </el-table-column>
-          <el-table-column label="结束时间" width="200" v-if="OrderForm.type == 'TO_C'">
+          <el-table-column label="天数" width="200" v-if="OrderForm.type == 'TO_C'">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.num" type="number" :min="0" :maxlength="20"></el-input>
+            </template>
+          </el-table-column> 
+         <!--  <el-table-column label="结束时间" width="200" v-if="OrderForm.type == 'TO_C'">
             <template slot-scope="scope">
               <el-date-picker style="width: 170px;" v-model="scope.row.end_time" type="datetime" placeholder="选择日期时间"
                 :picker-options="pickerOptionsEnd" value-format="yyyy-MM-dd HH:mm:ss">
               </el-date-picker>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <!-- <el-table-column label="差异">
             <template slot-scope="scope">
               {{ scope.row.usable_stock - scope.row.num || 0 }}
@@ -265,6 +267,27 @@
           </el-table-column>
         </el-table>
       </div>
+      <el-row style="margin-top: 15px;margin-bottom: 20px;">
+        <el-col :span="8">
+          <el-form-item label="应付金额:" prop="pay_price" :rules="rules.pay_price">
+            <span>{{ "¥" + price }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="折扣:" prop="">
+            <el-input placeholder="请输入" v-model="discount" @blur="handleBlur" :disabled="type == 'pone'"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="实付金额:" prop="real_price" :rules="rules.pay_price">
+            <!-- @input="validateNumber" 
+            <span>折扣:
+            </span>
+            <span>折后金额:</span>-->
+            <el-input v-model="OrderForm.real_price" placeholder="请输入" :disabled="type == 'pone'"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <!-- <div class="mx">
       <h3>支付信息</h3>
       <el-button v-if="!isDetail" class="button" size="mini" type="primary" icon="el-icon-circle-plus-outline"
@@ -447,7 +470,7 @@ export default {
         province_city_area_address: "",
         subtract_stock: false,
         warehouse_id: [],
-        return_warehouse_id:'',
+        return_warehouse_id: '',
         start_time: null,
         customer_name: "",
         customer_phone: '',
@@ -661,6 +684,7 @@ export default {
         size: 10
       },//商品分页
       orderType: '',//条形码查看类型
+      
     };
   },
   computed: {
@@ -676,11 +700,18 @@ export default {
     this.GET_CollectingAccountList();
     // 获取客户列表
     this.GET_CustomerList();
+    this.OrderForm.marketing_id=JSON.parse(JSON.parse(localStorage.getItem("admin_user")).data).uid
   },
   methods: {
+    // 租赁时间
+    timeChange(val) {
+      let start = new Date(val[1]); // 将起始日期字符串转换为Date对象
+      let end = new Date(val[0]); // 将结束日期字符串转换为Date对象
+      let timeDiff = Math.abs(end.getTime() - start.getTime()); // 获取时间差(单位:毫秒)
+      let monthDiff = Math.ceil(timeDiff / (24 * 60 * 60 * 1000));
+    },
     selMember(val) {
       API_BasicSetting.getCustomer(val).then(res => {
-
         this.$set(this.OrderForm, 'customer_name', res.name);
         this.$set(this.OrderForm, 'customer_phone', res.mobile);
         /*  this.$nextTick(() => { this.OrderForm.customer_name = res.name
@@ -929,8 +960,8 @@ export default {
         //goodsApiParams: { order_type: this.OrderForm.type,warehouse_ids:arr },
 
       });
-      goodsData.map(el=>{
-        el.end_time=''
+      goodsData.map(el => {
+        el.end_time = ''
         console.log(el);
       })
       this.OrderForm.product_list = goodsData;
@@ -1283,11 +1314,18 @@ export default {
         if (!this.OrderForm.product_list) return
         if (!this.id) {
           if (this.OrderForm.type == "TO_C") {
-            var start = new Date(this.OrderForm.start_time); // 将起始日期字符串转换为Date对象
+            /*   var start = new Date(this.OrderForm.start_time); // 将起始日期字符串转换为Date对象
+              this.OrderForm.product_list.map((item) => {
+                var end = new Date(item.end_time); // 将结束日期字符串转换为Date对象
+                var timeDiff = Math.abs(end.getTime() - start.getTime()); // 获取时间差(单位:毫秒)
+                var monthDiff = Math.ceil(timeDiff / (24 * 60 * 60 * 1000)); // 根据每个月平均天数进行近似计算
+                total += item.product_vo.day_price * item.num * monthDiff;
+              }); */
+            var start = new Date(this.time[1]); // 将起始日期字符串转换为Date对象
+            var end = new Date(this.time[0]); // 将结束日期字符串转换为Date对象
+            var timeDiff = Math.abs(end.getTime() - start.getTime()); // 获取时间差(单位:毫秒)
+            var monthDiff = Math.ceil(timeDiff / (24 * 60 * 60 * 1000)); // 根据每个月平均天数进行近似计算
             this.OrderForm.product_list.map((item) => {
-              var end = new Date(item.end_time); // 将结束日期字符串转换为Date对象
-              var timeDiff = Math.abs(end.getTime() - start.getTime()); // 获取时间差(单位:毫秒)
-              var monthDiff = Math.ceil(timeDiff / (24 * 60 * 60 * 1000)); // 根据每个月平均天数进行近似计算
               total += item.product_vo.day_price * item.num * monthDiff;
             });
             return total;
@@ -1299,14 +1337,13 @@ export default {
           }
         } else {
           if (this.OrderForm.type == "TO_C") {
-            var start = new Date(this.OrderForm.start_time); // 将起始日期字符串转换为Date对象
+            var start = new Date(this.time[1]); // 将起始日期字符串转换为Date对象
+            var end = new Date(this.time[0]); // 将结束日期字符串转换为Date对象
+            var timeDiff = Math.abs(end.getTime() - start.getTime()); // 获取时间差(单位:毫秒)
+            var monthDiff = Math.ceil(timeDiff / (24 * 60 * 60 * 1000)); // 根据每个月平均天数进行近似计算
             this.OrderForm.product_list.map((item) => {
-              var end = new Date(item.end_time); // 将结束日期字符串转换为Date对象
-              var timeDiff = Math.abs(end.getTime() - start.getTime()); // 获取时间差(单位:毫秒)
-              var monthDiff = Math.ceil(timeDiff / (24 * 60 * 60 * 1000)); // 根据每个月平均天数进行近似计算
               total += item.product_vo.day_price * item.num * monthDiff;
             });
-            console.log("total",total);
             return total;
           } else {
             this.OrderForm.product_list.map((item) => {

+ 3 - 3
manager-admin/src/views/stock/orderCheck.vue

@@ -125,10 +125,10 @@
                             {{ scope.row.goods_vo.name }}
                         </template>
                     </el-table-column>
-                    <el-table-column label="条码">
+                    <el-table-column label="sku">
                         <template slot-scope="scope">
-                            <span v-if="!id"> {{ scope.row.product_vo.bar_code }}</span>
-                            <span v-else> {{ scope.row.product_vo.bar_code }}</span>
+                            <span v-if="!id"> {{ scope.row.product_vo.sku }}</span>
+                            <span v-else> {{ scope.row.product_vo.sku }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="序列号">

+ 66 - 63
manager-admin/src/views/stock/orderOutbound.vue

@@ -24,16 +24,19 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="发货人姓名:" prop="sender.name">
-                <el-input v-model="deliveryForms.sender.name" :minlength="1" :maxlength="20" placeholder="请输入发货人姓名"
-                  :disabled="true"></el-input>
+                <!-- {{ deliveryForms.sender.name }}-->
+                 <el-input v-model="deliveryForms.sender.name" :minlength="1" :maxlength="20" placeholder="请输入发货人姓名"
+                  :disabled="true"></el-input> 
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="手机号:" prop="sender.phone">
-                <el-input v-model="deliveryForms.sender.phone" :minlength="1" :maxlength="20" :disabled="true"
-                  placeholder="请输入手机号"></el-input> </el-form-item></el-col>
+               <!-- {{ deliveryForms.sender.phone }}-->
+                 <el-input v-model="deliveryForms.sender.phone" :minlength="1" :maxlength="20" :disabled="true"
+                  placeholder="请输入手机号"></el-input>  </el-form-item></el-col>
             <el-col :span="12">
               <el-form-item label="发货地址:" prop="sender.address">
+                <!-- {{ deliveryForms.sender.province_name }} -->
                 <el-cascader size="large" :options="options" clearable :disabled="true" v-model="selectedOptions"
                   @change="sendHandleChange">
                 </el-cascader>
@@ -114,9 +117,9 @@
                 {{ scope.row.goods_vo.name }}
               </template>
             </el-table-column>
-            <el-table-column label="条码">
+            <el-table-column label="sku">
               <template slot-scope="scope">
-                {{ scope.row.product_vo.bar_code }}
+                {{ scope.row.product_vo.sku }}
               </template>
             </el-table-column>
             <el-table-column label="序列号" v-if="sn_code_list">
@@ -157,62 +160,62 @@
             :disabled="disabledType">扫码出库</el-button>
           <div style="width: 100%; display: block">
             <!--    //  -->
-              <el-table border :data="goodsExchangeAddForm.product_list" :cell-style="{ textAlign: 'center' }"
-                :header-cell-style="{ textAlign: 'center' }" style="width: 100%; margin-top: 20px">
-                <el-table-column label="商品编号">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.goods_vo.sn }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="商品名称">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.goods_vo.name }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="条码">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.product_vo.bar_code }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="序列号" v-if="sn_code_list">
-                  <template slot-scope="scope">
-                    <span v-for="(item, index) in scope.row.sn_code_list" :key="item.id"><span
-                        v-if="index !== 0">,</span>{{ item.sn_code }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="product_vo.spec_name" label="规格型号">
-                </el-table-column>
-                <el-table-column label="单位">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.product_vo.unit }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="出库数量">
-                  <template slot-scope="scope">
-                    {{ scope.row.num }}
-                    <!--  <el-input v-model="scope.row.out_num" type="number" :min="0" :maxlength="20"></el-input> -->
-                  </template>
-                </el-table-column>
-                <el-table-column label="库存数量">
-                  <template slot-scope="scope">
-                    <span v-if="!disabledType">{{ scope.row.usable_stock }}</span>
-                    <span v-else>{{ scope.row.use_able_stock }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column width="200" label="操作" v-if="!disabledType">
-                  <template slot-scope="scope">
-                    <!-- <el-button
+            <el-table border :data="goodsExchangeAddForm.product_list" :cell-style="{ textAlign: 'center' }"
+              :header-cell-style="{ textAlign: 'center' }" style="width: 100%; margin-top: 20px">
+              <el-table-column label="商品编号">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.goods_vo.sn }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="商品名称">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.goods_vo.name }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="sku">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.product_vo.sku }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="序列号" v-if="sn_code_list">
+                <template slot-scope="scope">
+                  <span v-for="(item, index) in scope.row.sn_code_list" :key="item.id"><span
+                      v-if="index !== 0">,</span>{{ item.sn_code }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="product_vo.spec_name" label="规格型号">
+              </el-table-column>
+              <el-table-column label="单位">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.product_vo.unit }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="出库数量">
+                <template slot-scope="scope">
+                  {{ scope.row.num }}
+                  <!--  <el-input v-model="scope.row.out_num" type="number" :min="0" :maxlength="20"></el-input> -->
+                </template>
+              </el-table-column>
+              <el-table-column label="实际库存">
+                <template slot-scope="scope">
+                  <span v-if="!disabledType">{{ scope.row.usable_stock }}</span>
+                  <span v-else>{{ scope.row.use_able_stock }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column width="200" label="操作" v-if="!disabledType">
+                <template slot-scope="scope">
+                  <!-- <el-button
                   size="mini"
                   @click="addSnCode(scope.row,scope.$index)"
                   >添加序列号</el-button
                 > -->
-                    <el-button size="mini" @click="
-                      goodsExchangeAddForm.product_list.splice(scope.$index, 1)
-                      ">删除</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-          
+                  <el-button size="mini" @click="
+                    goodsExchangeAddForm.product_list.splice(scope.$index, 1)
+                    ">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+
           </div>
 
           <el-divider></el-divider>
@@ -402,7 +405,7 @@
       </div>
       <el-dialog title="扫码出库" :visible.sync="scanDialogVisible" width="30%" :close-on-click-modal="false">
         <el-form ref="scanGoodsForm" :model="scanGoodsForm" inline>
-          <el-form-item label="条码" prop="bar_code">
+          <el-form-item label="sku" prop="bar_code">
             <el-input v-model="scanGoodsForm.bar_code" ref="input" @keyup.enter.native="toSearch()" :minlength="0"
               :maxlength="100"></el-input>
           </el-form-item>
@@ -490,7 +493,7 @@
         <!-- <el-button type="primary"> 获取全部单号 </el-button> -->
         <el-button type="primary" @click="saveErpWarehouseOut" :disabled="outType == 'check'" v-if="kdnCode !== ''">发货
         </el-button>
-        <el-button @click="roBack2()">返回</el-button>
+        <el-button @click="roBack2()">保存</el-button>
       </div>
     </div>
   </div>
@@ -541,7 +544,7 @@ export default {
       deliveryForms: {
         remark: "",
         declared_value: "",
-        appointment_type: "",
+        appointment_type: 0,
         total_weight: "",
         //发货人
         sender: {
@@ -843,7 +846,7 @@ export default {
           API_order.getKdShip(this.id, params).then((res) => {
             this.kdnCode = res;
             this.btnType = false;
-          }).catch(() => {  this.btnType = false; })
+          }).catch(() => { this.btnType = false; })
         } else {
           this.$message.error("表单填写有误,请检查")
           return false;
@@ -931,7 +934,7 @@ export default {
       API_order.getSendOrderDetail(this.id).then((res) => {
         res.product_list = res.order_item_vos;
         this.product_list = res.order_item_vos;
-        this.selectedOptions =res.warehouse_vo.ware_pro_city_area.split(",")
+        this.selectedOptions = res.warehouse_vo.ware_pro_city_area.split(",")
         this.receiverOptions = res.order_vo.province_city_area.split(",");
         if (this.outType !== undefined || res.kdn_order_code !== undefined) {
           this.goodsExchangeAddForm.product_list = res.order_item_vos

+ 1 - 1
ui-components/PickerWarehouseEntryBatch/src/defaultOptions.js

@@ -64,7 +64,7 @@ export const generalColumns = [
   // { label: '仓库名称', prop: 'warehouse_entry_id' },
   { label: '商品编号', prop: 'goods_vo.sn' },
   // { label: '库位号',   prop: 'code'},
-  { label: '商品条码', prop: 'product_vo.bar_code' },
+  { label: 'sku', prop: 'product_vo.bar_code' },
   { label: '序列号',   prop: 'product_vo.sn_code'},
   { label: '商品名称', prop: 'goods_vo.name' },
   { label: '规格型号', prop: 'product_vo.spec_name' },

+ 1 - 1
ui-domain/api.js

@@ -17,6 +17,6 @@ module.exports = {
   },
   // 生产环境
   pro: {
-    admin: window.__ENV__.API_ADMIN || 'http://apidoc.raycos.net'
+    admin: window.__ENV__.API_ADMIN || 'https://apidoc.raycos.net'
   }
 }