交货事件

jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue

@@ -630,6 +630,49 @@
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
+          <el-col :span="8" v-if="judgeShow('deliveryTime')">
+            <jnpf-form-tip-item
+              label="交货时间开始 "
+              v-if="judgeShow('deliveryTime')"
+              prop="deliveryTime"
+            >
+              <JnpfDatePicker
+                v-model="dataForm.deliveryTime"
+                @change="changeData('deliveryTime', -1)"
+                :startTime="dateTime(false, 1, 1, '', '')"
+                :endTime="dateTime(false, 1, 1, '', '')"
+                placeholder="请选择"
+                :disabled="judgeWrite('deliveryTime')"
+                clearable
+                :style="{ width: '100%' }"
+                type="date"
+                format="yyyy-MM-dd"
+              >
+              </JnpfDatePicker>
+            </jnpf-form-tip-item>
+          </el-col>
+
+          <el-col :span="8" v-if="judgeShow('deliveryTimeEnd')">
+            <jnpf-form-tip-item
+              label="交货时间结束 "
+              v-if="judgeShow('deliveryTimeEnd')"
+              prop="deliveryTimeEnd"
+            >
+              <JnpfDatePicker
+                v-model="dataForm.deliveryTimeEnd"
+                @change="changeData('deliveryTimeEnd', -1)"
+                :startTime="dateTime(false, 1, 1, '', '')"
+                :endTime="dateTime(false, 1, 1, '', '')"
+                placeholder="请选择"
+                :disabled="judgeWrite('deliveryTimeEnd')"
+                clearable
+                :style="{ width: '100%' }"
+                type="date"
+                format="yyyy-MM-dd"
+              >
+              </JnpfDatePicker>
+            </jnpf-form-tip-item>
+          </el-col>
           <el-col :span="8" v-if="judgeShow('modeTransport')">
             <jnpf-form-tip-item
               label="运输方式"
@@ -1740,6 +1783,10 @@ export default {
         subject3: undefined,
         deliveryModel: undefined,
         deliveryLocation: undefined,
+        deliveryTime: dayjs().valueOf(),
+        deliveryTimeEnd: dayjs()
+          .add(1, "year")
+          .valueOf(),
         modeTransport: undefined,
         costBearingMian: undefined,
         pricingModel: undefined,

jnpf-java-boot/jnpf-web/src/views/scm/contractL/index.vue

@@ -169,6 +169,26 @@
             width="180"
           >
           </el-table-column>
+          <el-table-column
+            prop="deliveryTime"
+            label="交货时间开始"
+            align="center"
+            width="180"
+          >
+            <template slot-scope="scope">
+              {{ fnTimeStr(scope.row.deliveryTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="deliveryTimeEnd"
+            label="交货时间结束"
+            align="center"
+            width="180"
+          >
+            <template slot-scope="scope">
+              {{ fnTimeStr(scope.row.deliveryTimeEnd) }}
+            </template>
+          </el-table-column>
           <el-table-column
             prop="deptId"
             label="签约主体"
@@ -393,6 +413,7 @@ import { thousandsFormat } from "@/components/Generator/utils/index";
 import SuperQuery from "@/components/SuperQuery";
 import superQueryJson from "./superQueryJson";
 import JNPFFormSet from "../contractSetPriceFormula/form";
+import dayjs from "dayjs";
 
 export default {
   components: {
@@ -543,6 +564,9 @@ export default {
       }
       return id;
     },
+    fnTimeStr(time) {
+      return dayjs(time).format("YYYY-MM-DD");
+    },
     toDetail(defaultValue, modelId) {
       if (!defaultValue) return;
       getConfigData(modelId).then(res => {