生命周期

src/benyun/utils/auth.ts

@@ -6,7 +6,7 @@ const ExpiresInKey = "AdminOMS-Expires-In";
 
 export function getToken() {
   if (process.env.NODE_ENV === "development") {
-    return "eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjhmMjYwODBiLTM1OWMtNGY3Yy04YzJiLTY4YTU3YTMyMWRkYyIsInVzZXJuYW1lIjoiYWRtaW4ifQ.Rlj0wedVOptGVxYX4q_INNsi1_VB2s4M3finjx4WJCfkMrghN8mIfPEjafnyocvNtuz3xbfYW3hpY8GdfsRtZw";
+    return "eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6Ijg5OGZhMzA1LTE5N2YtNGQwOC05ZTIxLTQ1NmM1YzE2MTcyMyIsInVzZXJuYW1lIjoiYWRtaW4ifQ.-l8TaSaD40cgBdjTmREh6JTHrxr0E7zh9JxNBk7pLdll0WbfR6j1colco717zFD9akels2yMWghgGaH704IB_A";
   } else {
     return Cookies.get(TokenKey);
   }

src/views/oms/B2BOrder/index.vue

@@ -1365,6 +1365,11 @@ export default class Order extends Vue {
     //遍历this.data
     for (let i = 0; i < this.data.length; i++) {
       if (!this.data[i].orderTimeout) continue;
+      if (this.data[i].isSubmitted === 1) {
+        this.data[i].orderTimeout = '';
+        continue;
+      }
+
       const to = this.data[i].orderTimeout;
       const cr = this.data[i].createTime;
 
@@ -1386,7 +1391,7 @@ export default class Order extends Vue {
       date2.setHours(parseInt(time2[0]));
       date2.setMinutes(parseInt(time2[1]));
       date2.setSeconds(parseInt(time2[2]));
-      let diff = date2.getTime() - new Date(createTime).getTime();
+      let diff = date2.getTime() - new Date().getTime(); //new Date(createTime).getTime();
 
       //计算秒
       let diffSec = Math.floor(Math.abs((diff / 1000)));

src/views/omsOrder/lifeCycle/index.vue

@@ -9,61 +9,35 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-        >新增
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-            type="success"
-            plain
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate"
-        >修改
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate">修改
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-            type="danger"
-            plain
-            icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
-        >删除
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete">删除
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-        >导出
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="lifeCycleList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="55" align="center" />
       <!--      <el-table-column label="主键" align="center" prop="id"/>-->
-      <el-table-column label="创建人" align="center" prop="createBy"/>
+      <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="事项" align="center" prop="matter"/>
-      <el-table-column label="操作人" align="center" prop="operator"/>
+      <el-table-column label="事项" align="center" prop="matter" />
+      <el-table-column label="操作人" align="center" prop="operator" />
       <el-table-column label="时间" align="center" prop="time" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
@@ -71,72 +45,45 @@
       </el-table-column>
       <el-table-column label="类型" align="center" prop="type">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.life_cycle_type" :value="scope.row.type"/>
+          <dict-tag :options="dict.type.life_cycle_type" :value="scope.row.type" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-          >修改
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改
           </el-button>
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-          >删除
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改生命周期对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" v-model="form" :rules="rules" label-width="130px">
         <el-form-item label="事项" prop="matter">
-          <el-input v-model="form.matter" placeholder="请输入事项"/>
+          <el-input v-model="form.matter" placeholder="请输入事项" />
         </el-form-item>
         <el-form-item label="操作人" prop="operator">
-          <el-input v-model="form.operator" placeholder="请输入操作人"/>
+          <el-input v-model="form.operator" placeholder="请输入操作人" />
         </el-form-item>
         <el-form-item label="时间" prop="time">
-          <el-date-picker clearable
-                          v-model="form.time"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择时间">
+          <el-date-picker clearable v-model="form.time" type="date" value-format="yyyy-MM-dd" placeholder="请选择时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择类型">
-            <el-option
-                v-for="dict in dict.type.life_cycle_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.life_cycle_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="请选择物料" prop="skuId">
-          <el-select placeholder="请选择物料">
-            <el-option
-                v-for="sku in materialSkuList"
-                :key="sku.id"
-                :label="sku.skuTitle"
-                :value="sku.id"
-            ></el-option>
+          <el-select placeholder="请选择物料" @change="handleSkuChange">
+            <el-option v-for="(sku, index) in materialSkuList" :key="`sku_${index}`" :label="sku.skuTitle"
+              :value="sku.id"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -161,6 +108,7 @@ import {
 export default {
   name: "LifeCycle",
   dicts: ['life_cycle_type'],
+  timer: null,
   data() {
     return {
       // 遮罩层
@@ -178,6 +126,7 @@ export default {
       // 生命周期表格数据
       lifeCycleList: [],
       materialSkuList: [],
+
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -198,6 +147,13 @@ export default {
     this.queryMaterialSkuList();
   },
   methods: {
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+    },
+    handleSkuChange(v) {
+      //this.form.skuId = v;
+      console.info(this.form)
+    },
     queryMaterialSkuList() {
       queryMaterialSku(this.queryParams).then(response => {
         this.materialSkuList = response.data;
@@ -257,24 +213,31 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
       this.open = true;
       this.title = "添加生命周期";
+      this.timer = setTimeout(() => {
+        this.reset();
+      }, 500);
+
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
       const id = row.id || this.ids
       getLifeCycle(id).then(response => {
-        this.form = response.data;
         this.open = true;
-        this.title = "修改生命周期";
+        this.timer = setTimeout(() => {
+          this.reset();
+          this.title = "修改生命周期";
+          this.form = response.data;
+          console.info(this.form, 'sdfsdfs')
+        }, 500);
       });
     },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          console.info(this.form);
           if (this.form.id != null) {
             updateLifeCycle(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -308,6 +271,9 @@ export default {
         ...this.queryParams
       }, `lifeCycle_${new Date().getTime()}.xlsx`)
     }
-  }
+  },
+  beforeDestroy() {
+    clearTimeout(this.timer);
+  },
 };
 </script>

src/views/orderConfig/orderTimeConfig/compoments/addConfig.vue

@@ -29,7 +29,7 @@ export default class AddQuestModel extends Vue {
         },
         columns: [
             [{
-                label: '超时时间(小时)',
+                label: '超时时间(分钟)',
                 prop: 'timeout',
                 labelWidth: '120px',
                 component: 'by-input'

src/views/orderConfig/orderTimeConfig/index.vue

@@ -38,7 +38,7 @@ export default class OrderConfig extends Vue {
             seq: true
         },
         columns: [{
-            title: '超时时间',
+            title: '超时时间(分钟)',
             field: 'timeout'
         }, {
             title: '创建于',