Browse Source

处理问题

yangg 1 year ago
parent
commit
47dad1a6c6
57 changed files with 39 additions and 11 deletions
  1. 1 1
      manager-admin/dist/index.html
  2. 0 0
      manager-admin/dist/static/css/app.8fe6119a598e09bb33f5a71a79d08750.css
  3. BIN
      manager-admin/dist/static/css/app.8fe6119a598e09bb33f5a71a79d08750.css.gz
  4. 0 0
      manager-admin/dist/static/js/48.2b9f31862148b7354e78.js
  5. BIN
      manager-admin/dist/static/js/48.2b9f31862148b7354e78.js.gz
  6. 0 0
      manager-admin/dist/static/js/48.f0402e82888e8d0c07d8.js
  7. BIN
      manager-admin/dist/static/js/48.f0402e82888e8d0c07d8.js.gz
  8. BIN
      manager-admin/dist/static/js/49.7c4174a16081a1fb3e7f.js.gz
  9. 0 0
      manager-admin/dist/static/js/49.8b5c51b613b9daf5b945.js
  10. BIN
      manager-admin/dist/static/js/49.8b5c51b613b9daf5b945.js.gz
  11. BIN
      manager-admin/dist/static/js/50.40d8af3576eea0fd17e4.js.gz
  12. 0 0
      manager-admin/dist/static/js/50.fc435ebb2de6ef255255.js
  13. BIN
      manager-admin/dist/static/js/50.fc435ebb2de6ef255255.js.gz
  14. 0 0
      manager-admin/dist/static/js/51.850e2bd90fcfdbfcbd83.js
  15. 0 0
      manager-admin/dist/static/js/52.81055a71a891ebf15e15.js
  16. BIN
      manager-admin/dist/static/js/52.81055a71a891ebf15e15.js.gz
  17. 0 0
      manager-admin/dist/static/js/53.36828255041b6ee36b7a.js
  18. BIN
      manager-admin/dist/static/js/53.36828255041b6ee36b7a.js.gz
  19. BIN
      manager-admin/dist/static/js/54.9977b444c1ca143e5947.js.gz
  20. 0 0
      manager-admin/dist/static/js/54.ccf370f936f89890b081.js
  21. 0 0
      manager-admin/dist/static/js/55.3d31aa1a8f7e9571c96b.js
  22. BIN
      manager-admin/dist/static/js/55.3d31aa1a8f7e9571c96b.js.gz
  23. BIN
      manager-admin/dist/static/js/56.5790b386c2d56924ec8c.js.gz
  24. 0 0
      manager-admin/dist/static/js/56.6207e78e34ee4251ff77.js
  25. 0 0
      manager-admin/dist/static/js/57.08eb9b8d015a41bbd0e1.js
  26. BIN
      manager-admin/dist/static/js/57.08eb9b8d015a41bbd0e1.js.gz
  27. 0 0
      manager-admin/dist/static/js/57.41a1be332f29a03e0069.js
  28. 0 0
      manager-admin/dist/static/js/58.5383c0102930721699da.js
  29. BIN
      manager-admin/dist/static/js/58.5383c0102930721699da.js.gz
  30. 0 0
      manager-admin/dist/static/js/59.90ee24c7571f4a4f38d6.js
  31. BIN
      manager-admin/dist/static/js/59.90ee24c7571f4a4f38d6.js.gz
  32. BIN
      manager-admin/dist/static/js/60.783ca013834bc61fd552.js.gz
  33. 0 0
      manager-admin/dist/static/js/60.b5b084c4fcbb9b4bbf01.js
  34. 0 0
      manager-admin/dist/static/js/61.b3926a3f1919dd549276.js
  35. BIN
      manager-admin/dist/static/js/61.b3926a3f1919dd549276.js.gz
  36. 0 0
      manager-admin/dist/static/js/7.28952d183dedb544a860.js
  37. BIN
      manager-admin/dist/static/js/7.28952d183dedb544a860.js.gz
  38. 0 0
      manager-admin/dist/static/js/7.c046ff9c922ae3902b55.js
  39. BIN
      manager-admin/dist/static/js/7.c046ff9c922ae3902b55.js.gz
  40. 0 0
      manager-admin/dist/static/js/8.2d02a946af3c80756619.js
  41. BIN
      manager-admin/dist/static/js/8.2d02a946af3c80756619.js.gz
  42. 0 0
      manager-admin/dist/static/js/8.ec5459b3d914cf5c28ac.js
  43. BIN
      manager-admin/dist/static/js/8.ec5459b3d914cf5c28ac.js.gz
  44. 0 0
      manager-admin/dist/static/js/app.0e91ade966c6a302d703.js
  45. BIN
      manager-admin/dist/static/js/app.0e91ade966c6a302d703.js.gz
  46. 0 0
      manager-admin/dist/static/js/app.94fd5f7c5166acfe6d43.js
  47. BIN
      manager-admin/dist/static/js/app.94fd5f7c5166acfe6d43.js.gz
  48. 0 0
      manager-admin/dist/static/js/manifest.018fe977b831887feddc.js
  49. 0 0
      manager-admin/dist/static/js/vendor.e2f2249dec469c77a1dd.js
  50. BIN
      manager-admin/dist/static/js/vendor.e2f2249dec469c77a1dd.js.gz
  51. 0 0
      manager-admin/dist/static/js/vendor.e708a6b67c83ac4e9fb3.js
  52. BIN
      manager-admin/dist/static/js/vendor.e708a6b67c83ac4e9fb3.js.gz
  53. 5 1
      manager-admin/src/views/stock/goodsTransfer.vue
  54. 5 3
      manager-admin/src/views/stock/orderAdd.vue
  55. 20 1
      manager-admin/src/views/stock/orderOutbound.vue
  56. 1 1
      ui-components/PickerWarehouseEntryBatch/src/defaultOptions.js
  57. 7 4
      ui-components/PickerWarehouseEntryBatch/src/main.vue

+ 1 - 1
manager-admin/dist/index.html

@@ -1,3 +1,3 @@
 <!DOCTYPE html><html><head><meta charset=utf-8><script>var ua = window.navigator.userAgent
     var isIe = /MSIE|Trident/.test(ua)
-    // if (isIe) window.location.href = 'http://support.dmeng.net/upgrade-your-browser.html?referrer=' + encodeURIComponent(window.location.href)</script><script src=/static/js/envs.js></script><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>erp</title><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.e871e78e650942073daeb722cf3f1458.css rel=stylesheet></head><body><div id=app><div style="display: flex;width: 100vw;height: 100vh;justify-content:center;align-items:center"><img src=/static/img/index.ripple-radio-preloader.gif alt=""></div></div><script src=/static/js/jquery.min.js></script><script src=/static/js/xlsx.full.min.js></script><script src=/static/js/echarts.min.js></script><script src=/static/js/base64.min.js></script><script src=/static/js/psl.min.js></script><script src=/static/UE/ueditor.config.js></script><script src=/static/UE/ueditor.all.js></script><script src=/static/UE/lang/zh-cn/zh-cn.js></script><script src=/static/UE/ueditor.parse.js></script><script src="//webapi.amap.com/maps?v=2.0&key=a4553619077791eb0a6df2f450b9a03b&plugin=AMap.CircleEditor"></script><script src=//webapi.amap.com/ui/1.1/main.js></script><script type=text/javascript src=/static/js/manifest.c2e44a7530f9dd8ce16c.js></script><script type=text/javascript src=/static/js/vendor.e708a6b67c83ac4e9fb3.js></script><script type=text/javascript src=/static/js/app.0e91ade966c6a302d703.js></script></body></html>
+    // if (isIe) window.location.href = 'http://support.dmeng.net/upgrade-your-browser.html?referrer=' + encodeURIComponent(window.location.href)</script><script src=/static/js/envs.js></script><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>erp</title><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.8fe6119a598e09bb33f5a71a79d08750.css rel=stylesheet></head><body><div id=app><div style="display: flex;width: 100vw;height: 100vh;justify-content:center;align-items:center"><img src=/static/img/index.ripple-radio-preloader.gif alt=""></div></div><script src=/static/js/jquery.min.js></script><script src=/static/js/xlsx.full.min.js></script><script src=/static/js/echarts.min.js></script><script src=/static/js/base64.min.js></script><script src=/static/js/psl.min.js></script><script src=/static/UE/ueditor.config.js></script><script src=/static/UE/ueditor.all.js></script><script src=/static/UE/lang/zh-cn/zh-cn.js></script><script src=/static/UE/ueditor.parse.js></script><script src="//webapi.amap.com/maps?v=2.0&key=a4553619077791eb0a6df2f450b9a03b&plugin=AMap.CircleEditor"></script><script src=//webapi.amap.com/ui/1.1/main.js></script><script type=text/javascript src=/static/js/manifest.018fe977b831887feddc.js></script><script type=text/javascript src=/static/js/vendor.e2f2249dec469c77a1dd.js></script><script type=text/javascript src=/static/js/app.94fd5f7c5166acfe6d43.js></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/css/app.8fe6119a598e09bb33f5a71a79d08750.css


BIN
manager-admin/dist/static/css/app.e871e78e650942073daeb722cf3f1458.css.gz → manager-admin/dist/static/css/app.8fe6119a598e09bb33f5a71a79d08750.css.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/48.2b9f31862148b7354e78.js


BIN
manager-admin/dist/static/js/48.2b9f31862148b7354e78.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/48.f0402e82888e8d0c07d8.js


BIN
manager-admin/dist/static/js/48.f0402e82888e8d0c07d8.js.gz


BIN
manager-admin/dist/static/js/49.7c4174a16081a1fb3e7f.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/49.8b5c51b613b9daf5b945.js


BIN
manager-admin/dist/static/js/49.8b5c51b613b9daf5b945.js.gz


BIN
manager-admin/dist/static/js/50.40d8af3576eea0fd17e4.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/50.fc435ebb2de6ef255255.js


BIN
manager-admin/dist/static/js/51.700475d4d18ac0bb8fae.js.gz → manager-admin/dist/static/js/50.fc435ebb2de6ef255255.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/51.850e2bd90fcfdbfcbd83.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/52.81055a71a891ebf15e15.js


BIN
manager-admin/dist/static/js/53.baf6551161a48327976d.js.gz → manager-admin/dist/static/js/52.81055a71a891ebf15e15.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/53.36828255041b6ee36b7a.js


BIN
manager-admin/dist/static/js/53.36828255041b6ee36b7a.js.gz


BIN
manager-admin/dist/static/js/54.9977b444c1ca143e5947.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/54.ccf370f936f89890b081.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/55.3d31aa1a8f7e9571c96b.js


BIN
manager-admin/dist/static/js/55.3d31aa1a8f7e9571c96b.js.gz


BIN
manager-admin/dist/static/js/56.5790b386c2d56924ec8c.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/56.6207e78e34ee4251ff77.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/57.08eb9b8d015a41bbd0e1.js


BIN
manager-admin/dist/static/js/57.08eb9b8d015a41bbd0e1.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/57.41a1be332f29a03e0069.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/58.5383c0102930721699da.js


BIN
manager-admin/dist/static/js/58.5383c0102930721699da.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/59.90ee24c7571f4a4f38d6.js


BIN
manager-admin/dist/static/js/59.90ee24c7571f4a4f38d6.js.gz


BIN
manager-admin/dist/static/js/60.783ca013834bc61fd552.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/60.b5b084c4fcbb9b4bbf01.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/61.b3926a3f1919dd549276.js


BIN
manager-admin/dist/static/js/61.b3926a3f1919dd549276.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/7.28952d183dedb544a860.js


BIN
manager-admin/dist/static/js/7.28952d183dedb544a860.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/7.c046ff9c922ae3902b55.js


BIN
manager-admin/dist/static/js/7.c046ff9c922ae3902b55.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/8.2d02a946af3c80756619.js


BIN
manager-admin/dist/static/js/8.2d02a946af3c80756619.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/8.ec5459b3d914cf5c28ac.js


BIN
manager-admin/dist/static/js/8.ec5459b3d914cf5c28ac.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/app.0e91ade966c6a302d703.js


BIN
manager-admin/dist/static/js/app.0e91ade966c6a302d703.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/app.94fd5f7c5166acfe6d43.js


BIN
manager-admin/dist/static/js/app.94fd5f7c5166acfe6d43.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/manifest.018fe977b831887feddc.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/vendor.e2f2249dec469c77a1dd.js


BIN
manager-admin/dist/static/js/vendor.e2f2249dec469c77a1dd.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/vendor.e708a6b67c83ac4e9fb3.js


BIN
manager-admin/dist/static/js/vendor.e708a6b67c83ac4e9fb3.js.gz


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

@@ -65,7 +65,11 @@
             scope.row.transfer_time | unixToDate
           }}</template> -->
         </el-table-column>
-
+        <el-table-column prop="type" label="类别">
+        <template slot-scope="scope">
+          {{ scope.row.product_vo.hire_or_sail=='sail' ? '售卖商品' : '租赁商品'  }}
+        </template>
+       </el-table-column>
         <el-table-column prop="goods_name" label="商品名称" />
        <el-table-column prop="type" label="sku">
         <template slot-scope="scope">

+ 5 - 3
manager-admin/src/views/stock/orderAdd.vue

@@ -282,7 +282,9 @@
         </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-input placeholder="请输入" v-model="discount" @blur="handleBlur" :disabled="type == 'pone'">
+              <template slot="append">折</template>
+            </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -292,7 +294,7 @@
         </el-col>
         <el-col :span="16" v-if="OrderForm.type == 'TO_C' && id">
           <el-form-item label="交通费明细:" prop="real_price">
-            <el-button @click="reimList">报销</el-button>
+            <el-button @click="reimList">查看明细</el-button>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -733,7 +735,7 @@ export default {
         options: [],
       },
       //折扣
-      discount: '',
+      discount: 0,
       pickerOptions: {
         disabledDate(v) {
           return v.getTime() < new Date().getTime() - 86400000;//  - 86400000是否包括当天

+ 20 - 1
manager-admin/src/views/stock/orderOutbound.vue

@@ -15,7 +15,19 @@
             <el-col>
               <el-form-item label="预约时间:" prop="" v-if="deliveryForms.appointment_type != 0">
                 <el-date-picker v-model="deliveryForms.appointment_time" type="datetime" placeholder="选择日期时间"
-                  :disabled="disabledType" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                  :disabled="disabledType" 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
+                  );
+                },
+              }"></el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
@@ -176,6 +188,11 @@
                   <span>{{ scope.row.product_vo.sku }}</span>
                 </template>
               </el-table-column>
+              <el-table-column label="库位号">
+                <!-- <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">
                   <div class="sn-code-container">
@@ -1223,6 +1240,8 @@ export default {
           }
           if (!el.sn_code_list) {
             el.sn_code_list = []
+          }else{
+            el.num = el.sn_code_list.length
           }
 
           this.deliveryForms.total_weight = Number(

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

@@ -65,7 +65,7 @@ export const generalColumns = [
   { label: '商品编号', prop: 'goods_vo.sn' },
   // { label: '库位号',   prop: 'code'},
   { label: 'sku', prop: 'product_vo.sku' },
-  //{ label: '序列号',   prop: 'product_vo.sn_code'},
+  { label: '商品类别',   prop: 'goods_vo.hire_or_sail'},
   { label: '商品名称', prop: 'goods_vo.name' },
   { label: '规格型号', prop: 'product_vo.spec_name' },
   { label: '单位', prop: 'product_vo.unit' },

+ 7 - 4
ui-components/PickerWarehouseEntryBatch/src/main.vue

@@ -27,11 +27,14 @@
         </el-table-column>
         <el-table-column v-else type="selection" label="选择" width="55" :selectable="checkDisable" reserve-selection
           align="center" />
-        <el-table-column v-for="column in columns" v-if="column.prop !== 'entry_time'" :key="column.label" align="center"
-          v-bind="column" />
-        <el-table-column v-for="column in columns" v-if="column.prop === 'entry_time'" :key="column.label" align="center"
+        <el-table-column v-for="column in columns" v-if="column.prop !== 'goods_vo.hire_or_sail'" :key="column.label" align="center"
+          v-bind="column" >
+          
+        </el-table-column>
+        <el-table-column v-for="column in columns" v-if="column.prop === 'goods_vo.hire_or_sail'" :key="column.label" align="center"
           v-bind="column">
-          <template slot-scope="scope">{{ scope.row.entry_time | unixToDate }}</template>
+          <template slot-scope="scope"> {{ scope.row.goods_vo.hire_or_sail=='sail' ? '售卖商品' : '租赁商品'  }}</template>
+         <!--  <template slot-scope="scope">{{ scope.row.entry_time | unixToDate }}</template> -->
         </el-table-column>
       </el-table>
       <div class="purchasePlan-picker__tools">

Some files were not shown because too many files changed in this diff