diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html index 32368fe2..c9193635 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html +++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html @@ -95,11 +95,15 @@ }, { field: 'orderCode', - title: '关联合同编号' + title: '关联合同编号', + }, { field: 'orderName', - title: '关联合同名称' + title: '关联合同名称', + formatter:function (value,row){ + return `${value}` + }, }, { field: 'deliveryCode', @@ -108,11 +112,12 @@ { field: 'total', title: '发货数量', + escape:true, formatter: function(value, row, index) { if (value){ - return value + return `${value}` }else{ - return 0 + return `0` } } }, @@ -168,6 +173,20 @@ function doClose(index){ $.modal.close(index); } + function openOrderDeail(value,row){ + var options = { + title: "合同查看", + url: ctx + `manage/order/edit/${value}`, + maxmin: false, + full: false, + index:1000, + width: 1050, + callBack: doClose, + btn:false + }; + window.localStorage.setItem('isOrderDetail',1) + $.modal.openOptions(options) + } \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/orderDetail.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/orderDetail.html new file mode 100644 index 00000000..13335ef9 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/orderDetail.html @@ -0,0 +1,484 @@ + + + + + + + + +
+
+

合同档案信息

+ +
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+
+ + + +
+
+
+
+
+
+ +
+
+ + + +
+
+
+
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ +
+
+ + +
+
+
+
+
+
+ +
+ + +
+
+ +
+
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+
+
+

合同清单列表

+
+ +
+ + +
+ + +
+
+ +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/add.html b/ruoyi-admin/src/main/resources/templates/manage/order/add.html index 6f32a7d0..6c9ea195 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/add.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/add.html @@ -13,6 +13,7 @@ margin-right: 20px; } +
diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html index 49cda3ef..4c7f4c99 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html @@ -7,7 +7,8 @@ .hideTd { display: none; } - label[for="versionCode"]{ + + label[for="versionCode"] { margin-right: 20px; } @@ -37,7 +38,8 @@
- +
@@ -54,7 +56,7 @@
@@ -69,7 +71,7 @@ - +
@@ -119,7 +121,7 @@
+ required>
@@ -191,7 +193,7 @@ function submitHandler() { if ($.validate.form()) { $.operate.save(prefix + "/edit", $('#form-order-edit').serialize()); - }else{ + } else { $.modal.alertWarning("请完善表单必填项"); } } @@ -208,7 +210,7 @@ title: '选择客户', width: "680", url: url, - height:'600', + height: '600', callBack: doSubmitCustomer }; @@ -221,7 +223,7 @@ title: '选择代表处', width: "680", url: url, - height:'600', + height: '600', callBack: doSubmitAgent }; @@ -234,7 +236,7 @@ title: '选择代理商', width: "680", url: url, - height:'600', + height: '600', callBack: doSubmitPartner }; @@ -328,15 +330,16 @@ top: '30px', left: '300px' }); - $('[name="versionCode"]').on('focus',function (){ + $('[name="versionCode"]').on('focus', function () { $(this).blur() }) + changeOrderType() }); function downloadTem() { $.modal.loading("正在下载，请稍候..."); - window.location.href=prefix + "/list/export" + window.location.href = prefix + "/list/export" $.modal.closeLoading(); // $.post(prefix + "/list/export", {}, function (result) { // if (result.code == web_status.SUCCESS) { @@ -430,7 +433,7 @@ field: 'discount', align: 'center', title: '折扣', - width:90, + width: 90, formatter: function (value, row, index) { var html = $.common.sprintf("", index, value); return html; @@ -455,7 +458,13 @@ var html = $.common.sprintf("", index, value); return html; } - }] + }], + onPostBody: ()=>{ + var isOrderDetail = window.localStorage.getItem('isOrderDetail') + if (isOrderDetail == 1) { + initReadonly() + } + } }; $.table.init(options); $('.discount').on('change', function () { @@ -466,17 +475,26 @@ }) } - function changeOrderType(){ - let orderType=$('[name="orderType"]').val() - if(orderType=='zq'){ + function changeOrderType() { + let orderType = $('[name="orderType"]').val() + if (orderType == 'zq') { $('[name="orderPartnerName"]').removeAttr('required') $('[name="orderPartnerName"]').parent().parent().parent().find('label').removeClass('is-required') - }else{ - $('[name="orderPartnerName"]').attr('required',true) + } else { + $('[name="orderPartnerName"]').attr('required', true) $('[name="orderPartnerName"]').parent().parent().parent().find('label').addClass('is-required') } } + function initReadonly() { + $('form').find('input').attr('disabled', true) + $('form').find('select').attr('disabled', true) + $('form').find('button').css('pointer-events', 'none') + $('form').find('span').css('pointer-events', 'none') + $('form').find('textarea').css('pointer-events', 'none') + window.localStorage.removeItem('isOrderDetail') + } + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/project/info/add.html b/ruoyi-admin/src/main/resources/templates/project/info/add.html index 644d454e..63817e73 100644 --- a/ruoyi-admin/src/main/resources/templates/project/info/add.html +++ b/ruoyi-admin/src/main/resources/templates/project/info/add.html @@ -5,25 +5,67 @@
@@ -31,73 +73,90 @@
项目信息
- - - - + + + + - - - + + + + + - + - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - + - - +
项目编码*项目名称*项目编码*项目名称*
客户名称*行业*客户名称* + 行业* - + + + + 属地 * +
项目阶段*项目阶段* - + + 项目把握度*项目把握度* - + + + 汇智支撑人员 +
运作机构 - + + 代理商
预计金额（RMB）预计下单时间
汇智支援人员联系方式
预计发货时间层地*代理商* - + + 联系方式
预计金额（RMB）*预计下单时间预计发货时间
竞争对手 +
@@ -106,26 +165,29 @@
- 其它： +
+ 其它： +
关键技术问题
项目描述* + 项目简述*
配置信息
- +
- @@ -135,39 +197,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + +
添加软件 - + 添加软件 +
数量 备注
1100
添加硬件 - -
序号硬件编码硬件型号数量备注
19801A3H0C5523V100
- 服务器配置
- H3C C5523V 桌面云终端-Intel 6核2.9GHz/8GB DDR4/256GB - SSD/4*USB3.0/4*USB2.0/1*HDMI/1*VGA/1*1000M/WiFi6 -
+ + + + + + + + + + + + +
+ 添加硬件 + + + 序号硬件编码硬件型号数量备注
是否国产 @@ -197,6 +248,8 @@ + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/project/info/project.html b/ruoyi-admin/src/main/resources/templates/project/info/project.html index b9927748..cdc4ec60 100644 --- a/ruoyi-admin/src/main/resources/templates/project/info/project.html +++ b/ruoyi-admin/src/main/resources/templates/project/info/project.html @@ -55,19 +55,38 @@
  • - +
    • -
  • +
  • - +
  • - +
  • - +
  • @@ -129,6 +148,8 @@ + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/project/info/selectPartner.html b/ruoyi-admin/src/main/resources/templates/project/info/selectPartner.html new file mode 100644 index 00000000..dc34427e --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/project/info/selectPartner.html @@ -0,0 +1,111 @@ + + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/project/info/selectPeople.html b/ruoyi-admin/src/main/resources/templates/project/info/selectPeople.html new file mode 100644 index 00000000..df1fe2a4 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/project/info/selectPeople.html @@ -0,0 +1,96 @@ + + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + \ No newline at end of file