修改：修改供应商显示发货人，发货人联系电话，发货地址，收货人联系电话，收货人联系电话，收货人联系地址。

ruoyi-admin/src/main/resources/templates/system/supplier/add.html

@@ -219,48 +219,51 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">税率：</label>
                 <div class="col-sm-8">
-                    <input name="taxRate" class="form-control" type="text" placeholder="%">
+                    <div class="input-group">
+                        <input name="taxRate" id="taxRate" class="form-control"  placeholder="13" type="text"/>
+                        <span class="input-group-addon">%</span>
+                    </div>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">发货人：</label>
                 <div class="col-sm-8">
-                    <input name="deliverPerson" class="form-control" th:field="*{deliverPerson}" type="text" required />
+                    <input name="deliverPerson" class="form-control"  type="text" required />
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">发货人电话：</label>
                 <div class="col-sm-8">
-                    <input name="deliverPersonPhone" class="form-control" th:field="*{deliverPersonPhone}" type="text"  required />
+                    <input name="deliverPersonPhone" class="form-control"  type="text"  required />
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">发货人地址：</label>
                 <div class="col-sm-8">
-                    <input name="deliverPersonAddress" class="form-control" th:field="*{deliverPersonAddress}" type="text" />
+                    <input name="deliverAddress" class="form-control"  type="text" />
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">收货人：</label>
                 <div class="col-sm-8">
-                    <input name="receiverPerson" class="form-control" th:field="*{receiverPerson}" type="text" required  />
+                    <input name="receiverPerson" class="form-control"  type="text" required  />
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">收货人电话：</label>
                 <div class="col-sm-8">
-                    <input name="receiverPersonPhone" class="form-control" th:field="*{receiverPersonPhone}" type="text" required  />
+                    <input name="receiverPersonPhone" class="form-control"  type="text" required  />
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">收货地址：</label>
                 <div class="col-sm-8">
-                    <input name="receiverAddress" class="form-control" th:field="*{receiverAddress}" type="text" required  />
+                    <input name="receiverAddress" class="form-control"  type="text" required  />
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-2 control-label">证件：</label>
-                <div class="col-sm-10">
+                <label class="col-sm-3 control-label">证件：</label>
+                <div class="col-sm-8">
                     <el-upload
                             :action="fileUploadUrl"
                             :on-success="uploadSuccess"

ruoyi-admin/src/main/resources/templates/system/supplier/detail.html

@@ -228,8 +228,10 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">税率：</label>
                 <div class="col-sm-8">
-                    <input name="taxRate" th:field="*{taxRate}" disabled
-                           class="form-control" type="text" placeholder="%">
+                    <div class="input-group">
+                        <input name="taxRate" id="taxRate" class="form-control"  placeholder="13" type="text" th:field="*{taxRate}"  disabled/>
+                        <span class="input-group-addon">%</span>
+                    </div>
                 </div>
             </div>
             <div class="form-group">
@@ -247,25 +249,27 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">发货人地址：</label>
                 <div class="col-sm-8">
-                    <input name="deliverPersonAddress" class="form-control" th:field="*{deliverPersonAddress}" type="text" disabled/>
+                    <input name="deliverAddress" class="form-control" type="text" th:field="*{deliverAddress}" required disabled/>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">收货人：</label>
                 <div class="col-sm-8">
-                    <input name="receiverPerson" class="form-control" th:field="*{receiverPerson}" type="text" required disabled />
+                    <input name="receivePerson" class="form-control"  type="text" th:field="*{receivePerson}" required disabled />
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">收货人电话：</label>
                 <div class="col-sm-8">
-                    <input name="receiverPersonPhone" class="form-control" th:field="*{receiverPersonPhone}" type="text" required disabled />
+                    <input name="receivePersonPhone" class="form-control"  type="text"
+                           th:field="*{receivePersonPhone}" required  disabled/>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">收货地址：</label>
                 <div class="col-sm-8">
-                    <input name="receiverAddress" class="form-control" th:field="*{receiverAddress}" type="text" required disabled />
+                    <input name="receiveAddress" class="form-control"  type="text"  th:field="*{receiveAddress}"
+                           disabled required  />
                 </div>
             </div>
             <div class="form-group">

ruoyi-admin/src/main/resources/templates/system/supplier/edit.html

@@ -220,7 +220,10 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">税率：</label>
                 <div class="col-sm-8">
-                    <input name="taxRate" th:field="*{taxRate}" class="form-control" type="text" placeholder="%">
+                    <div class="input-group">
+                        <input name="taxRate" id="taxRate" class="form-control"  placeholder="13" type="text" th:field="*{taxRate}"/>
+                        <span class="input-group-addon">%</span>
+                    </div>
                 </div>
             </div>
             <div class="form-group">
@@ -238,25 +241,27 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">发货人地址：</label>
                 <div class="col-sm-8">
-                    <input name="deliverPersonAddress" class="form-control" th:field="*{deliverPersonAddress}" type="text" />
+                    <input name="deliverAddress" class="form-control" type="text" th:field="*{deliverAddress}" required />
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">收货人：</label>
                 <div class="col-sm-8">
-                    <input name="receiverPerson" class="form-control" th:field="*{receiverPerson}" type="text" required>
+                    <input name="receivePerson" class="form-control"  type="text" th:field="*{receivePerson}" required  />
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">收货人电话：</label>
                 <div class="col-sm-8">
-                    <input name="receiverPersonPhone" class="form-control" th:field="*{receiverPersonPhone}" type="text" required>
+                    <input name="receivePersonPhone" class="form-control"  type="text"
+                           th:field="*{receivePersonPhone}" required  />
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">收货地址：</label>
                 <div class="col-sm-8">
-                    <input name="receiverAddress" class="form-control" th:field="*{receiverAddress}" type="text" required>
+                    <input name="receiveAddress" class="form-control"  type="text"  th:field="*{receiveAddress}"
+                           required  />
                 </div>
             </div>
             <div class="form-group">

ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html

@@ -128,8 +128,7 @@
                             return '<span style="color: red;">' + (value ? value : "-") + '</span>';
                         }
                     },
-                    {field: 'applyTime',title: '申请时间'
-                    },
+                    {field: 'applyTime',title: '申请时间'},
                     {title: '当前任务ID',field: 'taskId',visible: false},
                     { title: '待办用户ID',field: 'todoUserId', visible: false},
                     { title: '当前任务名称',field: 'taskName',
@@ -176,18 +175,21 @@
                     {title: '行业代码',field: 'industryCode'},
                     {title: '跟单员', field: 'merchandiser',visible: false},
                     {title: '跟单电话',field: 'merchandiserTelephone',visible: false},
+
                     {title: '采购员',field: 'purchaseBuyer',},
-                    {
-                        field: 'confirmTax',
-                        title: '是否含税',
+                    {field: 'confirmTax', title: '是否含税',
                         formatter: function(value, row, index) {
                            return $.table.selectDictLabel(confirmTaxDatas, value);
                         }
                     },
                     {title: '税率', field: 'taxRate'},
-                    {
-                        field: 'firstAddTime',
-                        title: '录入时间',
+                    {title: '发货人', field: 'deliverPerson',visible: false},
+                    {title: '发货人电话', field: 'deliverPersonPhone',visible: false},
+                    {title: '发货人地址', field: 'deliverAddress',visible: false},
+                    {title: '收货人', field: 'receivePerson',visible: false},
+                    {title: '收货人电话', field: 'receivePersonPhone',visible: false},
+                    {title: '收货地址', field: 'receiveAddress',visible: false},
+                    {field: 'firstAddTime', title: '录入时间',
                         formatter: function (value, row, index) {
                             if (value == null) {
                                 return " ";
@@ -247,7 +249,15 @@
                             return actions.join('');
                         }
                     }
-                ]
+                ],
+                rowStyle: function (row, index) {
+                    if (row.auditStatus=="0") {
+                        // 如果审核状态为待审核，则设置为红色
+                        return {css:{"color":"red"}};
+                    }
+                    // 否则使用默认样式
+                    return {};
+                }
             };
             $.table.init(options);
         });

ruoyi-admin/src/main/resources/templates/system/supplier/taskCgjlVerify.html

@@ -256,8 +256,10 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">税率：</label>
                 <div class="col-sm-8">
-                    <input name="taxRate" th:field="*{taxRate}" disabled
-                           class="form-control" type="text" placeholder="%">
+                    <div class="input-group">
+                        <input name="taxRate" id="taxRate" class="form-control"  placeholder="13" type="text" th:field="*{taxRate}" required disabled/>
+                        <span class="input-group-addon">%</span>
+                    </div>
                 </div>
             </div>
             <div class="form-group">
@@ -275,25 +277,27 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">发货人地址：</label>
                 <div class="col-sm-8">
-                    <input name="deliverPersonAddress" class="form-control" th:field="*{deliverPersonAddress}" type="text" disabled/>
+                    <input name="deliverAddress" class="form-control" type="text" th:field="*{deliverAddress}" required disabled/>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">收货人：</label>
                 <div class="col-sm-8">
-                    <input name="receiverPerson" class="form-control" th:field="*{receiverPerson}" type="text" required disabled />
+                    <input name="receivePerson" class="form-control"  type="text" th:field="*{receivePerson}" required disabled />
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">收货人电话：</label>
                 <div class="col-sm-8">
-                    <input name="receiverPersonPhone" class="form-control" th:field="*{receiverPersonPhone}" type="text" required disabled />
+                    <input name="receivePersonPhone" class="form-control"  type="text"
+                           th:field="*{receivePersonPhone}" required  disabled/>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">收货地址：</label>
                 <div class="col-sm-8">
-                    <input name="receiverAddress" class="form-control" th:field="*{receiverAddress}" type="text" required disabled />
+                    <input name="receiveAddress" class="form-control"  type="text"  th:field="*{receiveAddress}"
+                           disabled required  />
                 </div>
             </div>
             <div class="form-group">

ruoyi-admin/src/main/resources/templates/system/supplier/taskCgzgVerify.html

@@ -256,8 +256,10 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">税率：</label>
             <div class="col-sm-8">
-                <input name="taxRate" th:field="*{taxRate}" disabled
-                       class="form-control" type="text" placeholder="%">
+                <div class="input-group">
+                    <input name="taxRate" id="taxRate" class="form-control"  placeholder="13" type="number" th:field="*{taxRate}" required disabled/>
+                    <span class="input-group-addon">%</span>
+                </div>
             </div>
         </div>
         <div class="form-group">
@@ -275,25 +277,27 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">发货人地址：</label>
             <div class="col-sm-8">
-                <input name="deliverPersonAddress" class="form-control" th:field="*{deliverPersonAddress}" type="text" disabled/>
+                <input name="deliverAddress" class="form-control" type="text" th:field="*{deliverAddress}" required disabled/>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">收货人：</label>
             <div class="col-sm-8">
-                <input name="receiverPerson" class="form-control" th:field="*{receiverPerson}" type="text" required disabled />
+                <input name="receivePerson" class="form-control"  type="text" th:field="*{receivePerson}" required disabled />
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">收货人电话：</label>
             <div class="col-sm-8">
-                <input name="receiverPersonPhone" class="form-control" th:field="*{receiverPersonPhone}" type="text" required disabled />
+                <input name="receivePersonPhone" class="form-control"  type="text"
+                       th:field="*{receivePersonPhone}" required  disabled/>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">收货地址：</label>
             <div class="col-sm-8">
-                <input name="receiverAddress" class="form-control" th:field="*{receiverAddress}" type="text" required disabled />
+                <input name="receiveAddress" class="form-control"  type="text"  th:field="*{receiveAddress}"
+                       disabled required  />
             </div>
         </div>
         <div class="form-group">

ruoyi-admin/src/main/resources/templates/system/supplier/taskModifyApply.html

@@ -228,7 +228,10 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">税率：</label>
                 <div class="col-sm-8">
-                    <input name="taxRate" th:field="*{taxRate}" class="form-control" type="text" placeholder="%">
+                    <div class="input-group">
+                        <input name="taxRate" id="taxRate" class="form-control"  placeholder="13" type="text" th:field="*{taxRate}"/>
+                        <span class="input-group-addon">%</span>
+                    </div>
                 </div>
             </div>
             <div class="form-group">
@@ -246,25 +249,27 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">发货人地址：</label>
                 <div class="col-sm-8">
-                    <input name="deliverPersonAddress" class="form-control" th:field="*{deliverPersonAddress}" type="text" />
+                    <input name="deliverAddress" class="form-control" type="text" th:field="*{deliverAddress}" required />
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">收货人：</label>
                 <div class="col-sm-8">
-                    <input name="receiverPerson" class="form-control" th:field="*{receiverPerson}" type="text" required>
+                    <input name="receivePerson" class="form-control"  type="text" th:field="*{receivePerson}" required  />
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">收货人电话：</label>
                 <div class="col-sm-8">
-                    <input name="receiverPersonPhone" class="form-control" th:field="*{receiverPersonPhone}" type="text" required>
+                    <input name="receivePersonPhone" class="form-control"  type="text"
+                           th:field="*{receivePersonPhone}" required  />
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">收货地址：</label>
                 <div class="col-sm-8">
-                    <input name="receiverAddress" class="form-control" th:field="*{receiverAddress}" type="text" required>
+                    <input name="receiveAddress" class="form-control"  type="text"  th:field="*{receiveAddress}"
+                           required  />
                 </div>
             </div>
             <div class="form-group">