Merge remote-tracking branch 'origin/master'

src/views/file/collection.vue

@@ -121,6 +121,9 @@
                     <template #fileName="{ row }">
                         <span class="text-link" @click="tableRowName(row)">{{ row?.fileName }}</span>
                     </template>
+                    <template #sourceType="{ row }">
+                        <span>{{ row?.sourceType === 1 ? '原生' : '数字化' }}</span>
+                    </template>
                 </HcTable>
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
@@ -640,7 +643,7 @@ const tableColumn = ref([])
 const setTableColumns = () => {
     if (isBuiltDrawing.value === 1) {
         tableColumn.value = [
-            //{ key:'sheetSource', name: '文件来源', width: 140 },
+            { key:'sourceType', name: '文件来源', width: 100 },
             { key:'fileNumber', name: '文件编号', width: 100, autoWidth: true },
             { key:'fileName', name: '文件名称' },
             { key:'filePage', name: '文件页数', width: 120 },
@@ -657,7 +660,7 @@ const setTableColumns = () => {
         sheetSourceStatus()
     } else {
         tableColumn.value = [
-            //{ key:'sheetSource', name: '文件来源', width: 140 },
+            { key:'sourceType', name: '文件来源', width: 100 },
             { key:'fileNumber', name: '文件编号', width: 100, autoWidth: true },
             { key:'fileName', name: '文件名称' },
             { key:'filePage', name: '文件页数', width: 100 },

src/views/transfer/inspects.vue

@@ -164,7 +164,7 @@
                     </div>
                     <div class="textarea-box">
                         <div v-if="ishowAllopinion" @click="contentClick">
-                            <el-input v-model="reform.content" type="textarea" :autosize="{ minRows: 5 }" resize="none" placeholder="请填写抽检意见" disabled />
+                            <el-input v-model="reform.content" type="textarea" :autosize="{ minRows: 5 }" resize="none" placeholder="请填写抽检意见" />
                         </div>
                         <div v-else>
                             <el-input v-model="reform.myOpinion" type="textarea" :autosize="{ minRows: 5 }" resize="none" placeholder="请填写抽检意见" />