From 3fb7918c2ed201fa67ad9ed4ab2a12073049a95b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 15 Mar 2023 09:12:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=B7=BB=E5=8A=A0=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=97=B6=E9=97=B4=E6=94=BE=E5=BC=80=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/opm.js             |  8 +++++
 src/views/opm/operation.vue      |  2 +-
 src/views/opm/operation_form.vue | 41 ++++++++++++++------------
 src/views/rpm/rpjadd.vue         |  8 +++--
 src/views/vm/visit_detial.vue    | 50 ++++++++++++++------------------
 src/views/vm/vistoradd.vue       | 26 +++++++++++------
 6 files changed, 76 insertions(+), 59 deletions(-)

diff --git a/src/api/model/opm.js b/src/api/model/opm.js
index 3323f40b..7c55d908 100644
--- a/src/api/model/opm.js
+++ b/src/api/model/opm.js
@@ -70,6 +70,14 @@ export default {
 					data);
 			}
 		},
+		patch: {
+			name: "字段更新",
+			req: async function (id, data) {
+				return await http.patch(
+					`${config.API_URL}/opm/operation/${id}/`,
+					data);
+			}
+		},
 		create: {
 			name: "创建",
 			req: async function (data) {
diff --git a/src/views/opm/operation.vue b/src/views/opm/operation.vue
index ad5ecfba..50af5980 100644
--- a/src/views/opm/operation.vue
+++ b/src/views/opm/operation.vue
@@ -132,7 +132,7 @@
               >查看
             </el-button>
             <el-button
-              v-if="scope.row.state === 10"
+              v-if="scope.row.state!==50"
               link
               type="warning"
               size="small"
diff --git a/src/views/opm/operation_form.vue b/src/views/opm/operation_form.vue
index 213fabce..426a9eb7 100644
--- a/src/views/opm/operation_form.vue
+++ b/src/views/opm/operation_form.vue
@@ -18,32 +18,35 @@
           <el-row>
             <el-col :md="24" :sm="12" :xs="24">
               <el-form-item label="作业简介" prop="name">
-                <el-input v-model="form.name" type="text" clearable></el-input>
+                <el-input v-model="form.name" type="text" clearable :disabled="mode == 'edit'"></el-input>
               </el-form-item>
             </el-col>
             <el-col :md="12" :sm="12" :xs="24">
               <el-form-item label="开始时间"  prop="start_time">
                 <el-date-picker
+                :disabled="mode == 'edit'"
                   v-model="form.start_time"
                   type="datetime"
                   placeholder="选择开始时间"
+                  :default-time="defaultTime_start"
                 />
               </el-form-item>
             </el-col>
-
             <el-col :md="12" :sm="12" :xs="24">
               <el-form-item label="结束时间" prop="end_time">
                 <el-date-picker
+                :disabled="mode == 'edit'"
                   v-model="form.end_time"
                   type="datetime"
                   placeholder="选择结束时间"
+                  :default-time="defaultTime"
                 />
               </el-form-item>
             </el-col>
 
             <el-col :md="12" :sm="12" :xs="24">
               <el-form-item label="生产状态" prop="state_work">
-                <el-select v-model="form.state_work" placeholder="选择生产状态">
+                <el-select v-model="form.state_work" placeholder="选择生产状态"  :disabled="mode == 'edit'">
                   <el-option
                     v-for="item in stateoptions"
                     :key="item.id"
@@ -55,7 +58,7 @@
             </el-col>
             <el-col :md="12" :sm="24" :xs="24">
               <el-form-item label="作业区域" prop="area">
-                <el-select v-model="form.area" placeholder="选择作业区域" @change="areaChange" clearable>
+                <el-select v-model="form.area" placeholder="选择作业区域" @change="areaChange" clearable  :disabled="mode == 'edit'">
                   <el-option
                     v-for="item in areaoptions"
                     :key="item.id"
@@ -65,12 +68,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
-                      <el-col :md="24" :sm="12" :xs="24">
+            <el-col :md="24" :sm="12" :xs="24">
               <el-form-item label="具体地点" prop="place">
-                <el-input v-model="form.place" type="text" clearable></el-input>
+                <el-input v-model="form.place" type="text" clearable :disabled="mode == 'edit'"></el-input>
               </el-form-item>
             </el-col>
-         
             <el-col :md="12" :sm="24" :xs="24">
               <el-form-item label="业务部门" prop="dept_bus">
                 <el-cascader
@@ -89,15 +91,14 @@
                 />
               </el-form-item>
             </el-col>
-
             <el-col :md="12" :sm="24" :xs="24">
               <el-form-item label="部门协调员"  prop="coordinator">
                 <el-input
-              v-model="form.coordinator_name"
-              disabled
-              style="width:200px"
-            ></el-input>
-                <ehsUserSelect :multiple="false" @submit="getUser"/>
+                  v-model="form.coordinator_name"
+                  disabled
+                  style="width:220px"
+                ></el-input>
+                <ehsUserSelect :multiple="false" @submit="getUser"  v-if="mode == 'add'"/>
               </el-form-item>
             </el-col>
                <el-col :md="12" :sm="24" :xs="24">
@@ -138,9 +139,7 @@
         </el-form>
       </el-main>
       <el-footer>
-        <el-button type="primary" :loading="isSaveing" @click="submit"
-          >保存</el-button
-        >
+        <el-button type="primary" :loading="isSaveing" @click="submit" v-if="mode!=='show'">保存</el-button>
         <el-button @click="visible = false">取消</el-button>
       </el-footer>
     </el-container>
@@ -160,6 +159,8 @@ export default {
         edit: "编辑",
         show: "查看",
       },
+      defaultTime_start:new Date(2000, 1, 1, 10, 0, 0),
+      defaultTime:new Date(2000, 1, 1, 18, 0, 0),
       form: {},
       rules: {
         name: [{ required: true, message: "请输入作业简介" }],
@@ -244,14 +245,18 @@ export default {
                res = await this.$API.opm.operation.create.req(this.form);
                this.form.id = res.id;
             } else if (this.mode == "edit") {
-              res = await this.$API.opm.operation.update.req(
+              
+              let form = {};
+              form.vchannels = this.form.vchannels;
+              res = await this.$API.opm.operation.patch.req(
                 this.form.id,
-                this.form
+                form
               );
             }
             this.isSaveing = false;
             this.$emit("success", this.form, this.mode);
             this.visible = false;
+            console.log(res)
             this.$message.success("操作成功");
             return res;
           } catch (err) {
diff --git a/src/views/rpm/rpjadd.vue b/src/views/rpm/rpjadd.vue
index 04f66765..39dfa107 100644
--- a/src/views/rpm/rpjadd.vue
+++ b/src/views/rpm/rpjadd.vue
@@ -58,7 +58,8 @@
               <el-date-picker
                 v-model="rpjform.come_time"
                 type="datetime"
-                placeholder="选择结束时间"
+                placeholder="选择进厂时间"
+                :default-time="defaultTime_start"
               />
             </el-form-item>
           </el-col>
@@ -67,7 +68,8 @@
               <el-date-picker
                 v-model="rpjform.leave_time"
                 type="datetime"
-                placeholder="选择结束时间"
+                placeholder="选择离厂时间"
+                :default-time="defaultTime"
               />
             </el-form-item>
           </el-col>
@@ -426,6 +428,8 @@ export default {
         come_time: [{ required: true, message: "请选择" }],
         leave_time: [{ required: true, message: "请选择" }],
       },
+      defaultTime_start:new Date(2000, 1, 1, 10, 0, 0),
+      defaultTime:new Date(2000, 1, 1, 18, 0, 0),
     };
   },
   mounted() {
diff --git a/src/views/vm/visit_detial.vue b/src/views/vm/visit_detial.vue
index 56f57e2d..bf30fbfb 100644
--- a/src/views/vm/visit_detial.vue
+++ b/src/views/vm/visit_detial.vue
@@ -5,41 +5,27 @@
       <el-main>
         <el-card header="基本信息" shadow="hover">
           <el-descriptions :column="2">
-            <el-descriptions-item label="来访概述:">{{
-                form.name
-            }}</el-descriptions-item>
-            <el-descriptions-item label="来访级别:">{{
-                levelOptions[form.level]
-            }}</el-descriptions-item>
-            <el-descriptions-item label="来访单位:">{{
-                form.company
-            }}</el-descriptions-item>
+            <el-descriptions-item label="来访概述:">{{form.name}}</el-descriptions-item>
+            <el-descriptions-item label="来访级别:">{{levelOptions[form.level]}}</el-descriptions-item>
+            <el-descriptions-item label="来访单位:">{{form.company}}</el-descriptions-item>
             <el-descriptions-item label="来访人数:">
               <el-tag size="small">{{ form.count_people }}人</el-tag>
             </el-descriptions-item>
             <el-descriptions-item label="来访人员:">
               <el-tag size="small" v-for="item in form.visitors_" :key="item.id">{{ item.visitor_.name }}</el-tag>
             </el-descriptions-item>
-            <el-descriptions-item label="状态:">{{
-                state_[form.state]
-            }}</el-descriptions-item>
-            <el-descriptions-item label="来访时间:">{{
-                form.visit_time
-            }}</el-descriptions-item>
-            <el-descriptions-item label="离开时间:">{{
-                form.leave_time
-            }}</el-descriptions-item>
-            <el-descriptions-item label="来访事由:">{{
-                purpose_[form.purpose]
-            }}</el-descriptions-item>
-            <el-descriptions-item label="来访详述:">{{
-                form.description
-            }}</el-descriptions-item>
-
-            <el-descriptions-item label="接待人:" v-if="form.receptionist_">
-              {{ form.receptionist_.name }}
-            </el-descriptions-item>
+            <el-descriptions-item label="状态:">{{state_[form.state]}}</el-descriptions-item>
+            <el-descriptions-item label="来访时间:">{{form.visit_time}}</el-descriptions-item>
+            <el-descriptions-item label="离开时间:">{{form.leave_time}}</el-descriptions-item>
+            <el-descriptions-item label="来访事由:">{{purpose_[form.purpose]}}</el-descriptions-item>
+            <el-descriptions-item label="来访详述:">{{form.description}}</el-descriptions-item>
+            <el-descriptions-item label="接待人:" v-if="form.receptionist_">{{ form.receptionist_.name }}</el-descriptions-item>
           </el-descriptions>
+          <div v-if="form.vehicle_photos_">
+              <span style="vertical-align: top;">车辆照片:</span>
+              <el-image v-for="item in form.vehicle_photos_" :key="item.id" :src="item.path"
+              style="width:100px;height:100px"></el-image>
+            </div>
         </el-card>
         <el-card style="margin-top: 8px" shadow="hover" header="访客信息">
           <scTable ref="table" :data="peoplelist" row-key="id" height="auto" stripe hideDo hidePagination>
@@ -97,6 +83,7 @@
 </template>
 
 <script>
+ import config from "@/config"
 import ScBind from "@/components/scBind/index.vue";
 export default {
   emits: ["success", "closed"],
@@ -206,8 +193,13 @@ export default {
     setData(data) {
       this.loading = true
       this.$API.vm.visit.read.req(data.id).then((res) => {
-        this.loading = false
+        this.loading = false;
+        let urls = config.API_URL.slice(0,-4);
         this.form = res;
+
+        this.form.vehicle_photos_.forEach(item=>{
+          item.path = urls+item.path
+        })
       }).catch(e => { this.loading = false });
 
       this.$API.vm.people.list.req({ visit: data.id, page: 0 }).then((res) => {
diff --git a/src/views/vm/vistoradd.vue b/src/views/vm/vistoradd.vue
index 2cdd350d..0d451cb9 100644
--- a/src/views/vm/vistoradd.vue
+++ b/src/views/vm/vistoradd.vue
@@ -52,13 +52,15 @@
                 v-model="form.visit_time"
                 type="datetime"
                 placeholder="选择来访时间"
+                :default-time="defaultTime_start"
               />
             </el-form-item>
           </el-col>
 
           <el-col :md="8" :sm="12" :xs="24">
-            <el-form-item label="离开时间" prop="leave_time">
+            <el-form-item label="离开时间">
               <el-date-picker
+                :default-time="defaultTime"
                 v-model="form.leave_time"
                 type="datetime"
                 placeholder="选择离开时间"
@@ -362,7 +364,13 @@ export default {
       measureOptions: ['集中隔离','居家隔离','居家健康检测','排除风险'],
       active: 0,
       stepSuc: [0],
-      form: {purpose:10, level:10},
+      form: {
+        purpose:10, 
+        level:10,
+        leave_time:'',
+      },
+      defaultTime_start:new Date(2000, 1, 1, 10, 0, 0),
+      defaultTime:new Date(2000, 1, 1, 18, 0, 0),
       stepTitle: ["基本信息", "选择访客"],
       receptionistoptions: [],
       purposeoptions: [
@@ -479,13 +487,13 @@ export default {
         this.$refs.dialogForm.validate(async (valid) => {
           if (valid) {
             if(this.visitid){
-            this.$API.vm.visit.update
-          .req(this.visitid, this.form)
-          .then((res) => {
-            this.$message.success("基本信息更新成功");
-            this.getInit();
-            this.active = 1;
-          })
+              this.$API.vm.visit.update
+              .req(this.visitid, this.form)
+              .then((res) => {
+                this.$message.success("基本信息更新成功");
+                this.getInit();
+                this.active = 1;
+              })
             }else{
               this.$API.vm.visit.create.req(this.form).then(res=>{
                 this.visitid = res.id;