Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss

sgj

2025-12-26 28c49925c98713465db8cd64899d984d6cd0f7ad

 fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml

@@ -10,6 +10,16 @@
        <Property name="label">库区编码</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="parentId">
        <Property></Property>
        <Property name="label">收储公司</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getData&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">dwmc</Property>
        </Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property></Property>
        <Property name="label">组织编码</Property>
@@ -30,7 +40,7 @@
      </PropertyDef>
      <PropertyDef name="xzqhmc">
        <Property></Property>
        <Property name="label">区划名称</Property>
        <Property name="label">所在区县</Property>
      </PropertyDef>
      <PropertyDef name="kqcq">
        <Property></Property>
@@ -139,10 +149,69 @@
      view.get(&quot;#dialogImg&quot;).show();&#xD;
      &#xD;
      };</ClientEvent>
    <ClientEvent name="onReady">&#xD;
// start 通过收储公司id来加载库区数据&#xD;
/**&#xD;
 * 通用工具函数：获取URL中的指定参数值&#xD;
 * @param {String} name 要获取的参数名&#xD;
 * @returns {String/null} 参数值（无则返回null）&#xD;
 */&#xD;
function getUrlParam(name) {&#xD;
    // 解析URL的查询字符串（?后面的部分）&#xD;
    var search = window.location.search.substring(1);&#xD;
    // 分割成键值对数组&#xD;
    var params = search.split(&quot;&amp;&quot;);&#xD;
    for (var i = 0; i &lt; params.length; i++) {&#xD;
        var pair = params[i].split(&quot;=&quot;);&#xD;
        // 解码参数值（处理中文/特殊字符）&#xD;
        if (decodeURIComponent(pair[0]) === name) {&#xD;
            return decodeURIComponent(pair[1] || &quot;&quot;);&#xD;
        }&#xD;
    }&#xD;
    return null;&#xD;
};&#xD;
&#xD;
var parentId = getUrlParam(&quot;parentId&quot;);&#xD;
console.log(&quot;parentId&quot;,parentId);&#xD;
view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,{parentId: parentId}).flushAsync();&#xD;
//end   &#xD;
&#xD;
/**&#xD;
* 查看详情&#xD;
* @param {String/Number} manualId 手动传入的id值（可选）&#xD;
*/&#xD;
detail = function(manualId){&#xD;
    // 优先使用手动传入的id，没有则走原有选中行逻辑&#xD;
    var id = manualId;&#xD;
    if(!id){&#xD;
        var cur = view.get(&quot;#dgMain&quot;).get(&quot;selection&quot;);&#xD;
        if(cur){&#xD;
            id = cur.get(&quot;id&quot;);&#xD;
        }&#xD;
    }&#xD;
    &#xD;
    // 有id则打开详情页，否则提示&#xD;
    if(id){&#xD;
        var url = &quot;/com.fzzy.igds.Depot.d?parentId=&quot;+ id;&#xD;
        window.$openTab(&quot;仓库管理&quot;, url);&#xD;
    }else{&#xD;
        $notify(&quot;请先选择库区……&quot;);&#xD;
    }&#xD;
};&#xD;
&#xD;
renderId = function(arg){&#xD;
    var txt = arg.data.getText(&quot;id&quot;);&#xD;
    if(!txt) return true;&#xD;
    // 关键修改：点击时把txt作为参数传给detail方法（注意转义双引号）&#xD;
    var htm = &quot;&lt;a href='javascript:;' onClick='detail(\&quot;&quot;+txt+&quot;\&quot;)' >&quot;+txt+&quot;&lt;/a>&quot;;&#xD;
    arg.dom.innerHTML = htm;&#xD;
}&#xD;
</ClientEvent>
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
      <Property name="dataProvider">deptPR#getData</Property>
      <Property name="dataType">[dtMain]</Property>
      <Property name="loadMode">manual</Property>
    </DataSet>
    <Container>
      <Property name="className">c-param</Property>
@@ -176,6 +245,7 @@
        <RowSelectorColumn/>
        <RowNumColumn/>
        <DataColumn name="id">
          <ClientEvent name="onRenderCell">renderId(arg);</ClientEvent>
          <Property name="property">id</Property>
          <Property name="align">center</Property>
          <Property name="width">160</Property>
@@ -184,22 +254,16 @@
          <Property name="property">kqmc</Property>
          <Property name="align">left</Property>
        </DataColumn>
        <DataColumn name="parentId">
          <Property name="property">parentId</Property>
          <Property name="align">left</Property>
        </DataColumn>
        <DataColumn name="xzqhmc">
          <Property name="property">xzqhmc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="kqcq">
          <Property name="property">kqcq</Property>
          <Property name="align">center</Property>
          <Property name="width">120</Property>
        </DataColumn>
        <DataColumn name="yxcr">
          <Property name="property">yxcr</Property>
          <Property name="align">center</Property>
          <Property name="width">180</Property>
        </DataColumn>
        <DataColumn name="zdmj">
          <Property name="property">zdmj</Property>
          <Property name="align">center</Property>
          <Property name="width">180</Property>
        </DataColumn>
@@ -223,7 +287,7 @@
    <Dialog id="dialogMain">
      <Property name="iconClass">fa fa-tasks</Property>
      <Property name="caption">库区信息</Property>
      <Property name="width">1200</Property>
      <Property name="width">65%</Property>
      <Property name="closeable">false</Property>
      <Buttons>
        <Button id="btnOk">
@@ -267,13 +331,8 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement layoutConstraint="colSpan:2">
            <Property name="name">kqdz</Property>
            <Property name="property">kqdz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">kqcq</Property>
            <Property name="property">kqcq</Property>
            <Property name="name">parentId</Property>
            <Property name="property">parentId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -281,9 +340,9 @@
            <Property name="property">yxcr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zdmj</Property>
            <Property name="property">zdmj</Property>
          <AutoFormElement layoutConstraint="colSpan:2">
            <Property name="name">kqdz</Property>
            <Property name="property">kqdz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -302,17 +361,14 @@
            <Property name="property">xzqhdm</Property>
            <Editor/>
          </AutoFormElement>
          <Label>
            <Property name="text"></Property>
          </Label>
          <AutoFormElement>
            <Property name="name">createBy</Property>
            <Property name="property">createBy</Property>
            <Property name="name">zdmj</Property>
            <Property name="property">zdmj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">createTime</Property>
            <Property name="property">createTime</Property>
          <AutoFormElement layoutConstraint="colSpan:2">
            <Property name="name">remark</Property>
            <Property name="property">remark</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -371,18 +427,13 @@
            </Property>
            <Property name="text">帮助：点击坐标位置拾取</Property>
          </Link>
          <AutoFormElement layoutConstraint="colSpan:3">
            <Property name="name">remark</Property>
            <Property name="property">remark</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
      </Children>
      <Tools/>
    </Dialog>
    <Dialog id="dialogImg">
      <Property name="width">1000</Property>
      <Property name="height">640</Property>
      <Property name="width">55%</Property>
      <Property name="height">65%</Property>
      <Property name="iconClass">fa fa-tasks</Property>
      <Property name="caption">鸟瞰图预览</Property>
      <Buttons/>