修复已知问题

topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.js

@@ -5,20 +5,20 @@ $(document).ready(function () {
 });
 
 
-function initialize(){
+function initialize() {
 
     /**
      * 如果是详情页，展示数据，隐藏按钮
      * @type {boolean}
      */
     let isDetailPage = ($("#isDetailPage").val() === "true");
-    if(isDetailPage){
+    if (isDetailPage) {
         let proofingApplyNo = $("#proofingApplyNo").val();
         let productId = $("#productId").val();
-        if(proofingApplyNo!=null&& proofingApplyNo !== ''){
+        if (proofingApplyNo != null && proofingApplyNo !== '') {
             ajaxRenderDataGoForm(proofingApplyNo);
         }
-        if(productId!=null&& productId !== ''){
+        if (productId != null && productId !== '') {
             showTechnologyTable(productId);
         }
         $("#formButton").hide();
@@ -38,9 +38,9 @@ function bindQueryEvent() {
 }
 
 
-function saveForm(){
+function saveForm() {
     let technologyResult = DataUtil.getUpdateRow(technologyObj.gridManager); // 获取选中行
-    if(!technologyResult){
+    if (!technologyResult) {
         alert("请选择工艺！")
         return false;
     }
@@ -52,24 +52,24 @@ function saveForm(){
     var extendedData = {};
     extendedData.technology = Public.encodeJSONURI(technologyResult);
     extendedData.process = Public.encodeJSONURI(processResult);
-    var _self=this;
+    var _self = this;
     $('#submitForm').ajaxSubmit({
-        url : web_app.name + '/proofingMake/saveProofingMake.ajax',
-        param:extendedData,
-        success : function(data) {
-            if (data == "1"){
+        url: web_app.name + '/proofingMake/saveProofingMake.ajax',
+        param: extendedData,
+        success: function (data) {
+            if (data == "1") {
                 Public.successTip("保存成功！");
             }
             _self.close();
         }
     });
 
-    let productId=$("#productId").val();
-    let proofingMakeNo=$("#proofingMakeNo").val();
+    let productId = $("#productId").val();
+    let proofingMakeNo = $("#proofingMakeNo").val();
     UICtrl.addTabItem({
-        tabid: 'workInstructionApply'+proofingMakeNo,
+        tabid: 'workInstructionApply' + proofingMakeNo,
         text: "作业指导申请书",
-        url: web_app.name + '/workInstructionApply/forwardWorkInstructionApply.do?productId='+productId
+        url: web_app.name + '/workInstructionApply/forwardWorkInstructionApply.do?productId=' + productId
     });
 }
 
@@ -78,16 +78,56 @@ function resetForm(obj) {
     $(obj).formClean();
 }
 
-function ajaxRenderDataGoForm(proofingApplyNo){
-    Public.ajax(web_app.name + '/proofingMake/queryProofingApply.ajax',{proofingApplyNo:proofingApplyNo},function (data){
+function ajaxRenderDataGoForm(proofingApplyNo) {
+    Public.ajax(web_app.name + '/proofingMake/queryProofingApply.ajax', {proofingApplyNo: proofingApplyNo}, function (data) {
         //替换前缀为proofingApply的字段为proofingMake
         const updatedData = Object.entries(data).reduce((acc, [key, value]) => {
-            const updatedKey = (key !== "proofingApplyId" && key !== "proofingApplyNo")
+            const updatedKey = (
+                key !== "proofingApplyId" &&
+                key !== "proofingApplyNo" &&
+                key !== "proofingApplyApplicationStatus")
                 ? key.replace("proofingApply", "proofingMake")
                 : key;
             acc[updatedKey] = value;
             return acc;
         }, {});
         $('#submitForm').formSet(updatedData);
+        renderingDictionaries(updatedData);
     })
 }
+
+
+/**
+ * 渲染带数据字典的select
+ * @param obj
+ */
+function renderingDictionaries(obj) {
+
+    console.log(obj)
+    $("select").each(function () {
+        var id = $(this).attr("id");
+        if (obj.hasOwnProperty(id)) {
+
+
+
+            var keyValuePairs = new Map();
+
+            $('#' + id + ' option').each(function () {
+                var value = $(this).val();
+                var text = $(this).text();
+                keyValuePairs.set(value, text);
+            });
+
+            // 获取 对应的文本值
+            var selectedValue = obj[id];
+            var selectedText = keyValuePairs.get(selectedValue);
+
+            // 将文本值赋值给目标元素
+            $('#' + id + '_text').val(selectedText);
+            $('#' + id).val(selectedValue);
+
+            console.log("select:" + id+"("+selectedText+":"+selectedValue+")")
+        }
+    });
+
+}