Merge branch 'develop' of http://code.dashoo.cn/chengjian/opms_frontend into develop

src/views/plat/work/index.vue

@@ -21,12 +21,12 @@
               <el-option v-for="user in orderTypeList" :key="user.val" :label="user.val" :value="user.val" />
             </el-select>
           </el-form-item>
-          <el-form-item label="分派人员">
+          <el-form-item label="支持人员">
             <el-input
               v-model="queryForm.assignUserName"
               clearable
               filterable
-              placeholder="请输入分派人员"
+              placeholder="请输入支持人员"
               @keyup.enter.native="fetchData(1)" />
           </el-form-item>
           <el-form-item label="销售工程师">

src/views/proj/business/components/DetailsWorkOrder.vue

@@ -61,7 +61,7 @@
             prop: 'orderStatus',
           },
           {
-            label: '分派人员',
+            label: '支持人员',
             width: 'auto',
             prop: 'assignUserName',
           },

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

@@ -49,7 +49,7 @@
       <el-button type="primary" @click="save">确 定</el-button>
     </template>
 
-    <!-- 选择分派人员弹窗 -->
+    <!-- 选择支持人员弹窗 -->
   </el-dialog>
 </template>
 

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

@@ -27,7 +27,7 @@
       <el-button :disabled="!form.deliverManId && !form.projectManId" type="primary" @click="save">确 定</el-button>
     </template>
 
-    <!-- 选择分派人员弹窗 -->
+    <!-- 选择支持人员弹窗 -->
     <select-user ref="selectUser" @save="selectUser" />
   </el-dialog>
 </template>

src/views/work/order/components/DingTalkFromToVue.vue

@@ -5,6 +5,7 @@
         <div v-for="(item, index) in dingtalkForm.items" :key="index">
           <el-col v-if="item.componentName !== 'TableField'" :span="colSpan">
             <el-form-item
+              v-if="item.props.label != '支持人员'"
               :label="item.props.label"
               :prop="'items.' + index + '.props.value'"
               :rules="{

src/views/work/order/components/Edit.vue

@@ -20,7 +20,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="分派人员" prop="assignUserName">
+          <el-form-item label="支持人员" prop="assignUserName">
             <el-input v-model="form.assignUserName" readonly suffix-icon="el-icon-search" @focus="handleSelectUser" />
           </el-form-item>
         </el-col>
@@ -53,7 +53,7 @@
       <el-button v-if="!form.id" type="primary" @click="save">确 定</el-button>
     </template>
 
-    <!-- 选择分派人员弹窗 -->
+    <!-- 选择支持人员弹窗 -->
     <select-user ref="selectUser" @save="selectUser" />
   </el-dialog>
 </template>
@@ -124,6 +124,7 @@
         let item = this.orderTypeList.find((item) => {
           return item.id === this.form.orderTypeId
         })
+        console.log(item.formColumn)
         this.form.orderTypeName = item.name
         this.form.orderTypeCode = item.workflowCode
         this.dingtalkForm = JSON.parse(item.formColumn)

src/views/work/order/components/Feedback.vue

@@ -24,7 +24,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="分派人员" prop="assignUserName">
+          <el-form-item label="支持人员" prop="assignUserName">
             <el-input v-model="form.assignUserName" disabled readonly suffix-icon="el-icon-search" />
           </el-form-item>
         </el-col>
@@ -64,7 +64,7 @@
       <el-button type="primary" @click="save">确 定</el-button>
     </template>
 
-    <!-- 选择分派人员弹窗 -->
+    <!-- 选择支持人员弹窗 -->
     <select-user ref="selectUser" @save="selectUser" />
   </el-dialog>
 </template>

src/views/work/order/detail.vue

@@ -96,7 +96,7 @@
             <el-descriptions-item content-class-name="my-content" label="工单状态" label-class-name="my-label">
               {{ selectDictLabel(orderStatusOptions, detail.orderStatus) }}
             </el-descriptions-item>
-            <el-descriptions-item content-class-name="my-content" label="分派人员" label-class-name="my-label">
+            <el-descriptions-item content-class-name="my-content" label="支持人员" label-class-name="my-label">
               {{ detail.assignUserName }}
             </el-descriptions-item>
             <el-descriptions-item content-class-name="my-content" label="创建人" label-class-name="my-label">

src/views/work/order/index.vue

@@ -20,7 +20,7 @@
             </el-select>
           </el-form-item>
           <el-form-item prop="assignUserName">
-            <el-input v-model="queryForm.assignUserName" placeholder="分派人员姓名" @keyup.enter.native="fetchData" />
+            <el-input v-model="queryForm.assignUserName" placeholder="支持人员姓名" @keyup.enter.native="fetchData" />
           </el-form-item>
 
           <el-form-item>