生命周期

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.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6Ijg5OGZhMzA1LTE5N2YtNGQwOC05ZTIxLTQ1NmM1YzE2MTcyMyIsInVzZXJuYW1lIjoiYWRtaW4ifQ.-l8TaSaD40cgBdjTmREh6JTHrxr0E7zh9JxNBk7pLdll0WbfR6j1colco717zFD9akels2yMWghgGaH704IB_A";
+    return "eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6ImU5M2EwMTQ3LTQ5MjktNDI2OC05OTU5LTYxZmY3ZGJhZmNkYSIsInVzZXJuYW1lIjoiYWRtaW4ifQ.CH44ARBEr95sS0RBj0-aO-_kmUd66seuOEGrNQVlU4lFqnDnUJ7jne-T0rbaoB1rwzvN82LfG34srEgkHs5jzA";
   } else {
     return Cookies.get(TokenKey);
   }

src/views/oms/B2BOrder/index.vue

@@ -1364,9 +1364,10 @@ export default class Order extends Vue {
     if (this.orderTimeConfigOptions.length == 0) return;
     //遍历this.data
     for (let i = 0; i < this.data.length; i++) {
-      if (!this.data[i].orderTimeout) continue;
+      //if (!this.data[i].orderTimeout) continue;
       if (this.data[i].isSubmitted === 1) {
-        this.data[i].orderTmeout = '';
+        this.data[i].orderTimeout = '';
+        continue;
       }
 
       const to = this.data[i].orderTimeout;

src/views/omsOrder/lifeCycle/index.vue

@@ -30,7 +30,7 @@
     <el-table v-loading="loading" :data="lifeCycleList" @selection-change="handleSelectionChange">
       <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>
@@ -38,11 +38,11 @@
       </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="time" width="180">
+      <!-- <el-table-column label="时间" align="center" prop="time" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </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" />
@@ -63,17 +63,17 @@
 
     <!-- 添加或修改生命周期对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" v-model="form" :rules="rules" label-width="130px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-form-item label="事项" prop="matter">
           <el-input v-model="form.matter" placeholder="请输入事项" />
         </el-form-item>
         <el-form-item label="操作人" prop="operator">
           <el-input v-model="form.operator" placeholder="请输入操作人" />
         </el-form-item>
-        <el-form-item label="时间" prop="time">
+        <!-- <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>
-        </el-form-item>
+        </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"
@@ -81,7 +81,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="请选择物料" prop="skuId">
-          <el-select placeholder="请选择物料" @change="handleSkuChange">
+          <el-select v-model="form.skuId" placeholder="请选择物料">
             <el-option v-for="(sku, index) in materialSkuList" :key="`sku_${index}`" :label="sku.skuTitle"
               :value="sku.id"></el-option>
           </el-select>
@@ -108,9 +108,9 @@ import {
 export default {
   name: "LifeCycle",
   dicts: ['life_cycle_type'],
-  timer: null,
   data() {
     return {
+      timer: null,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -139,7 +139,13 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {
+        matter: [{ required: true, message: "请输入事项", trigger: "blur" }],
+        operator: [{ required: true, message: "请输入操作人", trigger: "blur" }],
+        // time: [{ required: true, message: "请选择时间", trigger: "blur" }],
+        type: [{ required: true, message: "请选择类型", trigger: "blur" }],
+        skuId: [{ required: true, message: "请选择物料", trigger: "blur" }],
+      }
     };
   },
   created() {
@@ -150,10 +156,6 @@ export default {
     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;
@@ -189,7 +191,7 @@ export default {
         version: null,
         matter: null,
         operator: null,
-        time: null,
+        // time: null,
         type: null,
         skuId: null
       };
@@ -223,25 +225,20 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       const id = row.id || this.ids
+      this.open = true;
       getLifeCycle(id).then(response => {
-        try {
-          this.open = true;
-          this.timer = setTimeout(() => {
-            this.reset();
-            this.title = "修改生命周期";
-            this.form = response.data;
-            console.info(this.form, 'sdfsdfs')
-          }, 500);
-        } catch (err) {
-          console.info(err)
-        }
+        this.timer = setTimeout(() => {
+          this.reset();
+          this.title = "修改生命周期";
+          this.form = response.data;
+        }, 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("修改成功");