Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/timesheet/src/views/contract/components/customContract.vue

@@ -797,7 +797,7 @@ export default {
       const { url } = row
       this.filePreviewUrl = ''; // 先清空，防止 iframe 不刷新
       this.$nextTick(() => {
-        this.filePreviewUrl = `http://1.94.62.58:9097` + url
+        this.filePreviewUrl = url
         // this.filePreviewUrl = `https://worktime.ttkuaiban.com/upload/7538bc96c9844c21a4c5f99e0de5d0f9.docx`
       });
     },

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -1204,14 +1204,14 @@
                     <el-input v-model="addMainForm.workOrderNum" :placeholder="$t('peaseenterthe')" clearable maxlength="40"></el-input>
                 </el-form-item>
                 <el-form-item :label="'包令号类型'" v-if="user.companyId == 4215">
-                    <el-select v-model="addMainForm.workOrderNumType" :placeholder="$t('defaultText.pleaseChoose')" clearable >
+                    <el-select v-model="addMainForm.workOrderNumType" :placeholder="$t('defaultText.pleaseChoose')" clearable style="width: 100%">
                         <el-option label="主飞控" :value="0"></el-option>
                         <el-option label="自动飞行" :value="1"></el-option>
                         <el-option label="高升力" :value="2"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item :label="$t('projectclassification')">
-                    <el-select v-model="addMainForm.categoryId" :placeholder="$t('defaultText.pleaseChoose')" clearable >
+                    <el-select v-model="addMainForm.categoryId" :placeholder="$t('defaultText.pleaseChoose')" clearable  style="width: 100%">
                         <el-option v-for="item in baseClfList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>