up

src/config/index.js

@@ -17,7 +17,7 @@ export default {
     statusWhiteList: [],    //http的status默认放行列表
     ossUrl: 'https://bladex-test-info.oss-cn-chengdu.aliyuncs.com', //oss地址
     smsPhone: '',  //测试接受短信验证码的手机号
-    dev_version: '202209191725',    //开发版本号
+    dev_version: '202209191820',    //开发版本号
     prod_host: 'http://47.110.251.215:8090',  //线上
     dev_host: 'http://192.168.4.6', //黄键楠
     //dev_host: 'http://192.168.3.13', //祝炜

src/styles/app/element.scss

@@ -444,6 +444,9 @@
 
 //设置表单样式
 .hc-excel-table-form-view {
+    position: relative;
+    display: flex;
+    justify-content: center;
     td {
         padding: 6px;
         font-family: "EUDC", 宋体, v-sans, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !important;

src/views/data-fill/components/ListItem.vue

@@ -184,6 +184,7 @@ const getFormDataInit = (item, pkeyId) => {
 //设置表单对象的数量
 const formData = ref([])
 const setFormDataNum = (datas) => {
+    ActiveKey.value = ''
     let newArr = [];
     for (let i = 0; i < datas.length; i++) {
         newArr.push(getFormDataInit(datas[i], datas[i].pkeyId))

src/views/data-fill/query.vue

@@ -452,7 +452,6 @@ const batchPrint = async () => {
     //处理数据
     printLoading.value = false
     if (!error && code === 200) {
-        console.log(data)
         if (isObjNull(data)) {
             window.$message?.error('数据异常')
         } else {

src/views/ledger/components/table-form.vue

@@ -431,20 +431,25 @@ const getBussPdfInfo = async () => {
 //获取当前日志资料关联的工序节点信息
 const queryCurrentLogSelectProcessList = async (dateVal) => {
     const {primaryKeyId} = menuItem.value
-    const { data } = await queryApi.queryCurrentLogSelectProcessList({
+    const { error, code, data, msg } = await queryApi.queryCurrentLogSelectProcessList({
         nodePrimaryKeyId: primaryKeyId,
         recordTime: dateVal,
         theLogId: ""
     }, false)
     //处理数据
-    let dataKeys = getArrValue(data), NodesArr = []
-    for (let i = 0; i < dataKeys.length; i++) {
-        NodesArr.push({
-            primaryKeyId: dataKeys[i]?.primaryKeyId,
-            pathName: dataKeys[i]?.path
-        })
+    if (!error && code === 200) {
+        let dataKeys = getArrValue(data), NodesArr = []
+        for (let i = 0; i < dataKeys.length; i++) {
+            NodesArr.push({
+                primaryKeyId: dataKeys[i]?.primaryKeyId,
+                pathName: dataKeys[i]?.path
+            })
+        }
+        processDataList.value = NodesArr
+    } else {
+        processDataList.value = []
+        if(msg) window?.$message?.warning(msg)
     }
-    processDataList.value = NodesArr
 }
 
 //新增表格

src/views/other-file/image-form.vue

@@ -109,10 +109,11 @@ import ossApi from "~api/oss";
 const router = useRouter()
 const useRoutes = useRoute()
 const useAppState = useAppStore()
-const projectId = ref(useAppState.getProjectId);
-const contractId = ref(useAppState.getContractId);
-const projectInfo = ref(useAppState.getProjectInfo);
+const projectId = ref(useAppState.getProjectId)
+const contractId = ref(useAppState.getContractId)
+const projectInfo = ref(useAppState.getProjectInfo)
 const isCollapse = ref(useAppState.getCollapse)
+const userInfo = ref(useAppState.getUserInfo)
 
 //路由参数
 const routerQuery = useRoutes?.query;
@@ -124,11 +125,15 @@ const dataType = parseInt(routerQuery?.dataType + '') || 1;
 const fileType = parseInt(routerQuery?.fileType + '') || 2;
 const toDayDate = dateFormat(new Date(), 'yyyy-MM-dd')
 
+const userRealName = ref('')
 //监听
 watch(() => [
-    useAppState.getCollapse
-], ([Collapse]) => {
+    useAppState.getCollapse,
+    useAppState.getUserInfo
+], ([Collapse,UserInfo]) => {
     isCollapse.value = Collapse
+    userRealName.value = UserInfo['real_name']
+    formValue.value.shootingUser = UserInfo['real_name']
 })
 
 //自动展开缓存
@@ -141,6 +146,7 @@ onMounted(() => {
     }
     formDataFormat({})
     queryById()
+    formValue.value.shootingUser = userInfo.value['real_name']
 })
 
 //详情
@@ -180,8 +186,9 @@ const formRef = ref(null)
 const formValue = ref({
     uploadTime: toDayDate,
     shootingTimeStr: toDayDate,
+    shootingUser: '',
     filmCode: '',
-    seeAlsoCode: ''
+    seeAlsoCode: '',
 })
 const rules = {
     uploadTime: {