Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt

Your Name

2022-08-20 94f2a5bed82ae0281ce5b821570597f6d73c1ce9

 src/views/specialWorkSystem/workTicket/workApply/components/broken.vue

@@ -9,9 +9,9 @@
                  <el-select v-model="form.operatorUids" multiple>
                     <el-option
                           v-for="item in workerList"
                           :key="item.value"
                           :label="item.label"
                           :value="item.value"
                           :key="item.uid"
                           :label="item.username"
                           :value="item.uid"
                     />
                  </el-select>
               </el-form-item>
@@ -122,13 +122,13 @@

   interface stateType {
      form: Object,
      workerList: Array<any>,
      csDepList: Array<any>,
      otherWorkList: Array<any>
   }
   export default defineComponent({
      name: 'brokenForm',
      components: {},
      props:['workerList'],
      setup() {
         const userInfo = useUserInfo()
         const { userInfos } = storeToRefs(userInfo);
@@ -150,24 +150,6 @@
               expStartTime: '',
               expEndTime: ''
            },
            workerList:[
               {
                  label: "张三",
                  value: 53
               },
               {
                  label: "李四",
                  value: 54
               },
               {
                  label: "测试一",
                  value: 55
               },
               {
                  label: "测试二",
                  value: 56
               }
            ],
            csDepList: [
               {
                  label: "单位一",
@@ -223,8 +205,7 @@
            "workDetail.operationDepId": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
            "workDetail.bcReason": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
            "workDetail.bcExplain": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
            "workDetail.otherSpecialWork": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
            "workDetail.involvedDepIds": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
            "workDetail.otherSpecialWork": [{ required: true, message: '该内容不能为空', trigger: 'blur' }]
         });
         const submitForm = async (formEl: FormInstance | undefined) => {
            if (!formEl) return
@@ -287,7 +268,7 @@
      .applyBtn{
         width: 100%;
         background: #fff;
         height: 80px;
         padding-top: 15px;
         z-index: 5;
         box-shadow: 0 -3px 8px rgba(150,150,150,.1);
         display: flex;