Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/components/Template/HandleFormItem.vue

@@ -343,6 +343,7 @@ export default {
                 }]
             },
             allowedTypes: ["zip","rar","doc","docx","pdf","jpg"],
+            signData: null,//签名数据
         }
     },
     watch: {
@@ -699,6 +700,7 @@ export default {
             }
         },
         onEditSignSave(data) {
+            this.signData = data;
             // 检查是否有待上传的文件
             if (this.pendingUploadFile) {
                 // 签名验证通过，将文件添加到列表并上传
@@ -1286,8 +1288,8 @@ export default {
                 const oldAttList = JSON.parse(recordOldVlaue || "[]");
                 recordValue = attList.map(item => item.name).join(";");
                 recordOldVlaue = oldAttList.map(item => item.name).join(";");
-                oldUrl = oldAttList.map(item => item.url).join(";");
-                url = attList.map(item => item.url).join(";");
+                oldUrl = oldAttList.map(item => item.url).join("|");
+                url = attList.map(item => item.url).join("|");
             }
 
             const record = {
@@ -1304,6 +1306,9 @@ export default {
             if (data) {
                 record.reason = data.remark
             }
+            if(this.type === "attachment" && this.signData){
+                record.reason = this.signData.remark;
+            }
 
             const params = {
                 type: "fieldChanged",

src/components/Template/StepComponents/ZLSubPackage.vue

@@ -11,6 +11,7 @@
                         @blur = "(e)=>onCommonBlur(e,item.key)"
                         v-model="formData[item.key]" />
                     <span class="ml-5">{{ item.unit }}</span>
+                    <el-button class="ml-5" type="primary" v-if="item.key == 'fzsl'" :disabled="!formData[item.key]" plain @click="onConfirm(item.key)">确定</el-button>
                 </div>
                 <div class="header-item">
                     <div class="header-title">分装单位</div>
@@ -359,9 +360,9 @@ export default {
             if (this.formData[field]) {
                 this.formErrors[field] = false;
             }
-            if(field === 'fzsl'){
-                this.onBlurFzsl(e);
-            }
+        },
+        onConfirm(field){
+            this.onBlurFzsl(this.formData[field]);
         },
         onBlurFzNum(index, field) {
             if (this.fzList[index]) {

src/views/business/comps/template/dialog/SubPackageDialog.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" title="分装（分装后的编号可用于下一步关联选择）" append-to-body
+    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" title="分装" append-to-body
         :visible.sync="visible" @close="close" width="1100px">
         <div class="dialog-content">
             <div class="header-container">
@@ -12,9 +12,12 @@
                 </div>
                 <div class="header-item">
                     <div class="header-title">分装数量</div>
-                    <HandleFormItem :isFieldsRecord="false" :fieldKey="formData.mybh +id+ '_fzsl'" @blur="onBlurFzsl"
+                    <div class="item-center">
+                        <HandleFormItem :isFieldsRecord="false" :fieldKey="formData.mybh +id+ '_fzsl'" 
                         :item="integerInputNumberItem" type="inputNumber" :error="formErrors.fzsl"
                         v-model="formData.fzsl" />
+                        <el-button class="ml-5" type="primary" :disabled="!formData.fzsl" plain @click="onBlurFzsl(formData.fzsl)">确定</el-button>
+                    </div>
                 </div>
             </div>
             <div class="content-container">
@@ -480,7 +483,10 @@ export default {
     border-radius: 4px;
     padding: 20px;
 }
-
+.item-center{
+    display: flex;
+    align-items: center;
+}
 .header-title {
     margin-bottom: 10px;
 }