feature(*): 1、OMS硬件默认于洋改为姜辉

2、新建工作项输入负责人不生效
3、新建计划如何修改
4、支持交付经理填写【现场交付时间】字段

src/views/work/deliver/components/detailWork.vue

@@ -173,6 +173,11 @@
               {{ parseTime(theProgress.softwareCheckTime, '{y}-{m}-{d}') }}
             </el-form-item>
           </el-col>
+          <el-col v-if="form.progressType == '40'" :span="12">
+            <el-form-item label="现场交付时间：" style="margin: 0px">
+              {{ parseTime(theProgress.softwareSpotDeliveryTime, '{y}-{m}-{d}') }}
+            </el-form-item>
+          </el-col>
           <el-col v-if="form.progressType == '40'" :span="12">
             <el-form-item label="已完成工作内容：" style="margin: 0px">
               {{ theProgress.completedContent }}

src/views/work/deliver/components/editWork.vue

@@ -27,6 +27,13 @@
               readonly
               suffix-icon="el-icon-search"
               @focus="openUser(false, 'principalPersonId', 'principalPerson')" />
+            <!-- <el-select
+              v-model="selectUserType"
+              placeholder="请选择类型"
+              style="width: 28%"
+              @change="changeSelectUserType">
+              <el-option v-for="item in userTypes" :key="item.label" :label="item.label" :value="item.label" />
+            </el-select> -->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -158,7 +165,13 @@
       <el-button v-if="editable" type="primary" @click="save">确 定</el-button>
     </template>
     <!-- 选择用户 -->
-    <select-user ref="user" :label="label" :multiple="multiple" :property="property" @save="getUser" />
+    <select-user
+      ref="user"
+      :label="label"
+      :multiple="multiple"
+      :property="property"
+      :query-params="{ roles: roles }"
+      @save="getUser" />
   </el-dialog>
 </template>
 
@@ -173,6 +186,22 @@
     components: { SelectUser },
     data() {
       return {
+        roles: [],
+        // selectUserType: '全部',
+        // userTypes: [
+        //   {
+        //     val: [],
+        //     label: '全部',
+        //   },
+        //   {
+        //     val: ['SalesEngineer', 'ProductLineManager'],
+        //     label: '销售人员',
+        //   },
+        //   {
+        //     val: ['ProjectDeliveryManager'],
+        //     label: '交付经理',
+        //   },
+        // ],
         theProgress: {},
         form: {
           progressTitle: undefined,
@@ -210,6 +239,9 @@
     mounted() {},
     methods: {
       open(planId, orderId, type, editable, row) {
+        // this.selectUserType = '全部'
+        // this.roles.splice(0, this.roles.length)
+
         this.theProgress = row
         this.planId = planId
         this.editable = editable
@@ -314,6 +346,18 @@
 
         xhr.send()
       },
+      // 选择选择客户类型
+      changeSelectUserType() {
+        this.roles.splice(0, this.roles.length)
+        for (let item of this.userTypes) {
+          if (item.label == this.selectUserType) {
+            for (let role of item.val) {
+              this.roles.push(role)
+            }
+            break
+          }
+        }
+      },
       // 打开选择用户信息
       openUser(multiple, property, label) {
         this.multiple = multiple

src/views/work/deliver/components/softwareComplete.vue

@@ -31,6 +31,16 @@
               value-format="yyyy-MM-dd HH:mm:ss" />
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="现场交付时间" prop="softwareSpotDeliveryTime">
+            <el-date-picker
+              v-model="form.softwareSpotDeliveryTime"
+              placeholder="请选择日期"
+              style="width: 100%"
+              type="date"
+              value-format="yyyy-MM-dd HH:mm:ss" />
+          </el-form-item>
+        </el-col>
         <el-col :span="24">
           <el-form-item label="已完成工作内容" prop="completedContent">
             <el-input
@@ -93,6 +103,7 @@
           softwareCheckTime: '',
           softwareCheckFileUrl: '',
           softwareCheckFileName: '',
+          softwareSpotDeliveryTime: '',
           completedContent: '',
           completedWork: '',
           uncompletedContent: '',
@@ -102,6 +113,7 @@
         rules: {
           softwareCheckFileUrl: [{ required: true, message: '不能为空', trigger: ['blur', 'change'] }],
           softwareCheckTime: [{ required: true, message: '不能为空', trigger: ['blur', 'change'] }],
+          softwareSpotDeliveryTime: [{ required: true, message: '不能为空', trigger: ['blur', 'change'] }],
           completedContent: [{ required: true, message: '不能为空', trigger: ['blur', 'change'] }],
           completedWork: [{ required: true, message: '不能为空', trigger: ['blur', 'change'] }],
           uncompletedContent: [{ required: true, message: '不能为空', trigger: ['blur', 'change'] }],
@@ -132,6 +144,7 @@
         this.form.softwareCheckTime = ''
         this.form.softwareCheckFileUrl = ''
         this.form.softwareCheckFileName = ''
+        this.form.softwareSpotDeliveryTime = ''
         this.form.completedContent = ''
         this.form.completedWork = ''
         this.form.uncompletedContent = ''
@@ -228,6 +241,7 @@
                 softwareCheckTime: this.form.softwareCheckTime,
                 softwareCheckFileUrl: this.form.softwareCheckFileUrl,
                 softwareCheckFileName: this.form.softwareCheckFileName,
+                softwareSpotDeliveryTime: this.form.softwareSpotDeliveryTime,
                 completedContent: this.form.completedContent,
                 completedWork: this.form.completedWork,
                 uncompletedContent: this.form.uncompletedContent,

src/views/work/deliver/plan.vue

@@ -28,14 +28,16 @@
                 </div>
               </div>
               <div class="flex-between">
-                <div>{{ parseTime(v.planStartDate, '{m}-{d}') }} ~ {{ parseTime(v.planEndDate, '{m}-{d}') }}</div>
-                <el-button
-                  v-show="workOrderStatus != 20 && v.planStatus != 30"
-                  style="padding: 0"
-                  type="text"
-                  @click="openAddPlan(v.id)">
-                  编辑
-                </el-button>
+                <span>
+                  {{ parseTime(v.planStartDate, '{m}-{d}') }} ~ {{ parseTime(v.planEndDate, '{m}-{d}') }}
+                  <el-button
+                    v-show="workOrderStatus != 20 && curPlanStatus != 30"
+                    style="padding: 0; margin-left: 10px"
+                    type="text"
+                    @click="openAddPlan(v.id)">
+                    编辑
+                  </el-button>
+                </span>
               </div>
             </li>
           </ul>
@@ -85,7 +87,7 @@
           </vab-query-form-top-panel>
           <vab-query-form-left-panel>
             <el-button
-              v-show="workOrderStatus != 20 && curPlanStatus != 30 && orderType == '10'"
+              v-show="workOrderStatus != 20 && curPlanStatus != 30 && curPlanId && curPlanId > 0"
               v-permissions="['order:delivery:work:add']"
               icon="el-icon-plus"
               type="primary"