【新增】操作日志，配置中心

src/views/setting/components/log-operation.vue

@@ -47,7 +47,7 @@
       <div class="btn-group clearfix">
         <div class="fl" />
         <div class="fr">
-          <el-button size="small" type="primary" @click="handleExport">导出</el-button>
+          <ExportButton :exUrl="'admin/user/mch/export'" :exParams="exParams" />
         </div>
       </div>
 
@@ -83,7 +83,6 @@
 
 <script>
 import { getOplogList } from '@/api/setting'
-import { downloadFiles } from '@/utils/util'
 
 export default {
   data() {
@@ -103,6 +102,18 @@ export default {
     }
   },
 
+  computed: {
+    exParams() {
+      return {
+        account: this.screenForm.account,
+        name: this.screenForm.name,
+        obj: this.screenForm.obj,
+        startTime: this.screenForm.date ? this.screenForm.date[0] : '',
+        endTime: this.screenForm.date ? this.screenForm.date[1] : '',
+      }
+    },
+  },
+
   created() {
     this.getList();
   },
@@ -169,15 +180,6 @@ export default {
       this.getList();
     },
 
-    // 导出
-    handleExport() {
-      let screenData = {
-        orderId: this.screenForm.orderId,
-        status: this.screenForm.status,
-      };
-      downloadFiles('tax/export', screenData);
-    },
-
   }
 }
 </script>

src/views/setting/oplog.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="app-container">
-    <el-radio-group v-model="logType" size="small">
+    <!-- <el-radio-group v-model="logType" size="small">
       <el-radio-button label="login">登录日志</el-radio-button>
       <el-radio-button label="operation">操作日志</el-radio-button>
       <el-radio-button label="examine">审批日志</el-radio-button>
     </el-radio-group>
-    <el-divider></el-divider>
+    <el-divider></el-divider> -->
 
     <LoginLog v-if="logType === 'login'" />
     <OperationLog v-if="logType === 'operation'" />
@@ -27,7 +27,7 @@ export default {
   },
   data() {
     return {
-      logType: 'login',
+      logType: 'operation',
     }
   },
   created() {

src/views/setting/other.vue

@@ -3,7 +3,8 @@
     <el-radio-group v-model="formType" size="small">
       <el-radio-button label="first">订单日期设置</el-radio-button>
       <el-radio-button label="second">工程登录二次引用设置</el-radio-button>
-      <el-radio-button label="third">提货单二次打印设置</el-radio-button>
+      <el-radio-button label="third">自动预留单生成</el-radio-button>
+      <el-radio-button label="fourth">库存显示规则设置</el-radio-button>
     </el-radio-group>
 
     <div v-show="formType === 'first'">
@@ -25,8 +26,43 @@
 
     <div v-show="formType === 'third'">
       <div style="margin: 40px 0 30px;">
-        <div>提货单二次打印密码设置</div>
-        <div><el-input v-model="thirdForm.password" placeholder="请输入密码" size="small" style="width: 150px; margin-top: 20px;"></el-input></div>
+        <div>预留单自动生成时间，从订单审单后，第</div>
+        <el-input v-model="thirdForm.day" type="number" size="small" style="width: 150px; margin-top: 20px; margin-right: 10px"></el-input>
+        <span>天零时起，按商家提交订单时间顺序，自动生成预留单</span>
+      </div>
+      <el-button type="primary" size="small">确 定</el-button>
+    </div>
+
+    <div v-show="formType === 'fourth'">
+      <div style="margin: 40px 0 30px;">
+        <div>总可发货数 = 总库存数-总预留数-总发货申请暂扣</div>
+        <div style="margin-top: 20px">订单查询库存时：</div>
+        <div style="margin-top: 10px">总可发货数为0，显示无货</div>
+        <div style="margin-top: 10px">
+          <span>总可发货数</span>
+          <el-input v-model="fourthForm.input1" type="number" size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <span>到</span>
+          <el-input v-model="fourthForm.input2" type="number" size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <span>，总库存显示具体数量</span>
+        </div>
+        <div style="margin-top: 10px">
+          <span>总可发货数</span>
+          <el-input v-model="fourthForm.input3" type="number" size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <span>到</span>
+          <el-input v-model="fourthForm.input4" type="number" size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <span>，总库存显示有货</span>
+        </div>
+        <div style="margin-top: 10px">
+          <span>总可发货数大于</span>
+          <el-input v-model="fourthForm.input5" type="number" size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <span>，总库存显示充足</span>
+        </div>
+        <div style="margin-top: 30px">发货申请查询库存时：</div>
+        <div style="margin-top: 10px">
+          <span>可发货数大于</span>
+          <el-input v-model="fourthForm.input6" type="number" size="small" style="width: 100px; margin: 0 10px;"></el-input>
+          <span>显示充足</span>
+        </div>
       </div>
       <el-button type="primary" size="small">确 定</el-button>
     </div>
@@ -46,8 +82,11 @@ export default {
         password: '',
       },
       thirdForm: {
-        password: '',
+        day: '',
       },
+      fourthForm: {
+
+      }
     }
   },
   created() {
@@ -68,7 +107,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
-
+  .app-container {
+    color: #333333;
+    font-size: 14px;
+  }
 </style>
 <style>
   .demo-table-expand {

src/views/supply/pickup/check.vue

@@ -258,13 +258,13 @@ export default {
 
     // 点击打印
     printData() {
-      if(!item.printNum) {
-        this.queryItem = item;
+      // if(!item.printNum) {
+        // this.queryItem = item;
         this.isShowPrint = true;
         // addPrint({ids: item.id}).then(res => {
 
         // })
-      }
+      // }
     },
   }
 }