Merge remote-tracking branch 'origin/master'

src/views/modules/cw/invoice/InvoiceFormTask.vue

@@ -37,11 +37,11 @@
               <el-input :readonly="true" placeholder="请填写项目编号" v-model="scope.row.programNo"/>
             </template>
           </vxe-table-column>
-<!--          <vxe-table-column field="clientName" title="委托方" :edit-render="{}">-->
-<!--            <template v-slot:edit="scope">-->
-<!--              <el-input :readonly="true" placeholder="请填写委托方" v-model="scope.row.clientName"/>-->
-<!--            </template>-->
-<!--          </vxe-table-column>-->
+          <!--          <vxe-table-column field="clientName" title="委托方" :edit-render="{}">-->
+          <!--            <template v-slot:edit="scope">-->
+          <!--              <el-input :readonly="true" placeholder="请填写委托方" v-model="scope.row.clientName"/>-->
+          <!--            </template>-->
+          <!--          </vxe-table-column>-->
           <!--            <vxe-table-column field="reportNo" title="报告号" :edit-render="{}">-->
           <!--              <template v-slot:edit="scope">-->
           <!--                <el-input v-model="scope.row.reportNo" placeholder="请填写报告号"/>-->
@@ -392,9 +392,9 @@
       </el-row>
 
 
-        <el-form :disabled="status === 'audit'?false:true">
-          <el-divider content-position="left"><i class="el-icon-document"></i>
-            发票明细
+      <el-form :disabled="status === 'audit'?false:true">
+        <el-divider content-position="left"><i class="el-icon-document"></i>
+          发票明细
           <el-button style="margin-left: 20px" type="primary" :disabled="status === 'audit'?false:true" size="mini" @click="insertEvent('detail')" plain>
             新增
           </el-button>
@@ -432,172 +432,172 @@
             </div>
             <el-button style="margin-left: 20px" slot="reference" :disabled="status === 'audit'?false:true" type="warning" size="mini" plain>导入</el-button>
           </el-popover>
-          </el-divider>
-        </el-form>
+        </el-divider>
+      </el-form>
 
       <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status !== 'audit'"
                label-width="160px" @submit.native.prevent>
-      <el-row  :gutter="15">
-        <vxe-table
-          border
-          show-overflow
-          show-footer
-          ref="detailTable"
-          class="vxe-table-element"
-          :data="inputForm.financeInvoiceDetailDTOList"
-          style="margin-left: 5em"
-          @cell-click=""
-          @edit-closed=""
-          highlight-current-row
-          :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true}"
-        >
-          <vxe-table-column field="code" title="发票代码" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input v-model="scope.row.code" placeholder="请填写发票代码"/>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="number" title="发票号" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input
-                oninput ="value=value.replace(/\D|^/g,'')"
-                placeholder="请填写发票号"
-                maxlength="8"
-                @blur="checkNumber(scope.row,scope.$rowIndex)"
-                v-model="scope.row.number"
-                clearable>
-              </el-input>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="account" title="开票金额(元)" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input-number
-                @blur="checkAccount(scope.row,scope.$rowIndex)"
-                v-model="scope.row.account"
-                controls-position="right"
-                :controls="false"
-                style="width:100%;"
-                :max="999999999999999"
-                :precision="2"
-                placeholder="请填写开票金额"
-                :step="0.01"
-                :min="0"
-                clearable>
-              </el-input-number>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="rate" title="税率(%)" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input-number
-                @blur="checkRate(scope.row, scope.$rowIndex)"
-                v-model="scope.row.rate"
-                controls-position="right"
-                :controls="false"
-                style="width:100%;"
-                :precision="2"
-                placeholder="请填写税率"
-                :step="0.01"
-                :min="0"
-                clearable>
-              </el-input-number>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="amount" title="金额" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input :readonly="true" v-model="scope.row.amount" placeholder="请填写金额"/>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="tax" title="税额" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input :readonly="true" v-model="scope.row.tax" placeholder="请填写税额"/>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="allAmount" title="累计登记金额" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input-number
-                v-model="scope.row.allAmount"
-                controls-position="right"
-                :controls="false"
-                style="width:100%;"
-                :precision="2"
-                placeholder="请填写累计登记金额"
-                :step="0.01"
-                :min="0"
-                clearable>
-              </el-input-number>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column title="操作" width="100">
-            <template v-slot="scope">
-              <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
-            </template>
-          </vxe-table-column>
-        </vxe-table>
-      </el-row>
+        <el-row  :gutter="15">
+          <vxe-table
+            border
+            show-overflow
+            show-footer
+            ref="detailTable"
+            class="vxe-table-element"
+            :data="inputForm.financeInvoiceDetailDTOList"
+            style="margin-left: 5em"
+            @cell-click=""
+            @edit-closed=""
+            highlight-current-row
+            :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true}"
+          >
+            <vxe-table-column field="code" title="发票代码" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.code" placeholder="请填写发票代码"/>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="number" title="发票号" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input
+                  oninput ="value=value.replace(/\D|^/g,'')"
+                  placeholder="请填写发票号"
+                  maxlength="8"
+                  @blur="checkNumber(scope.row,scope.$rowIndex)"
+                  v-model="scope.row.number"
+                  clearable>
+                </el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="account" title="开票金额(元)" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input-number
+                  @blur="checkAccount(scope.row,scope.$rowIndex)"
+                  v-model="scope.row.account"
+                  controls-position="right"
+                  :controls="false"
+                  style="width:100%;"
+                  :max="999999999999999"
+                  :precision="2"
+                  placeholder="请填写开票金额"
+                  :step="0.01"
+                  :min="0"
+                  clearable>
+                </el-input-number>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="rate" title="税率(%)" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input-number
+                  @blur="checkRate(scope.row, scope.$rowIndex)"
+                  v-model="scope.row.rate"
+                  controls-position="right"
+                  :controls="false"
+                  style="width:100%;"
+                  :precision="2"
+                  placeholder="请填写税率"
+                  :step="0.01"
+                  :min="0"
+                  clearable>
+                </el-input-number>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="amount" title="金额" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input :readonly="true" v-model="scope.row.amount" placeholder="请填写金额"/>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="tax" title="税额" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input :readonly="true" v-model="scope.row.tax" placeholder="请填写税额"/>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="allAmount" title="累计登记金额" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input-number
+                  v-model="scope.row.allAmount"
+                  controls-position="right"
+                  :controls="false"
+                  style="width:100%;"
+                  :precision="2"
+                  placeholder="请填写累计登记金额"
+                  :step="0.01"
+                  :min="0"
+                  clearable>
+                </el-input-number>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column title="操作" width="100">
+              <template v-slot="scope">
+                <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
+              </template>
+            </vxe-table-column>
+          </vxe-table>
+        </el-row>
       </el-form>
       <div v-if="false">
-      <el-divider content-position="left"><i class="el-icon-document"></i>
-        收款明细
-        <el-button style="margin-left: 20px" :disabled="status === 'audit' || status === 'taskFormDetail'" type="primary" size="mini" @click="insertEvent('receivables')" plain>
-          新增
-        </el-button>
-      </el-divider>
-      <el-row  :gutter="15">
-        <vxe-table
-          border
-          show-overflow
-          show-footer
-          ref="receivablesTable"
-          class="vxe-table-element"
-          :data="inputForm.financeInvoiceReceivablesDTOList"
-          style="margin-left: 5em"
-          @cell-click=""
-          @edit-closed=""
-          highlight-current-row
-          :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true}"
-        >
-          <vxe-table-column field="remittanceUnit" title="汇款单位" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input v-model="scope.row.remittanceUnit" placeholder="请填写汇款单位"/>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="remittanceAmount" title="汇款金额(元)" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input-number
-                v-model="scope.row.remittanceAmount"
-                controls-position="right"
-                :controls="false"
-                style="width:100%;"
-                :precision="2"
-                placeholder="请填写汇款金额"
-                :step="0.01"
-                :min="0"
-                clearable>
-              </el-input-number>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="remittanceDate" title="汇款时间" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input v-model="scope.row.remittanceDate" type="date" transfer placeholder="请填写汇款时间"/>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column title="操作" width="100">
-            <template v-slot="scope">
-              <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'receivables')">删除</el-button>
-            </template>
-          </vxe-table-column>
-        </vxe-table>
-      </el-row>
-      <el-divider content-position="left"><i class="el-icon-document"></i>发票作废</el-divider>
-      <el-row :gutter="15">
-        <el-col :span="24">
-          <el-form-item label="作废原因" prop="financeInvoiceInvalidDTO.remarks"
-                        :rules="[
+        <el-divider content-position="left"><i class="el-icon-document"></i>
+          收款明细
+          <el-button style="margin-left: 20px" :disabled="status === 'audit' || status === 'taskFormDetail'" type="primary" size="mini" @click="insertEvent('receivables')" plain>
+            新增
+          </el-button>
+        </el-divider>
+        <el-row  :gutter="15">
+          <vxe-table
+            border
+            show-overflow
+            show-footer
+            ref="receivablesTable"
+            class="vxe-table-element"
+            :data="inputForm.financeInvoiceReceivablesDTOList"
+            style="margin-left: 5em"
+            @cell-click=""
+            @edit-closed=""
+            highlight-current-row
+            :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true}"
+          >
+            <vxe-table-column field="remittanceUnit" title="汇款单位" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.remittanceUnit" placeholder="请填写汇款单位"/>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="remittanceAmount" title="汇款金额(元)" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input-number
+                  v-model="scope.row.remittanceAmount"
+                  controls-position="right"
+                  :controls="false"
+                  style="width:100%;"
+                  :precision="2"
+                  placeholder="请填写汇款金额"
+                  :step="0.01"
+                  :min="0"
+                  clearable>
+                </el-input-number>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="remittanceDate" title="汇款时间" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.remittanceDate" type="date" transfer placeholder="请填写汇款时间"/>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column title="操作" width="100">
+              <template v-slot="scope">
+                <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'receivables')">删除</el-button>
+              </template>
+            </vxe-table-column>
+          </vxe-table>
+        </el-row>
+        <el-divider content-position="left"><i class="el-icon-document"></i>发票作废</el-divider>
+        <el-row :gutter="15">
+          <el-col :span="24">
+            <el-form-item label="作废原因" prop="financeInvoiceInvalidDTO.remarks"
+                          :rules="[
                         {required: true, message:'作废原因不能为空', trigger:'blur'}
                ]">
-            <el-input maxlength="500" type="textarea" placeholder="请填写作废原因" v-model="inputForm.financeInvoiceInvalidDTO.remarks" show-word-limit></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
+              <el-input maxlength="500" type="textarea" placeholder="请填写作废原因" v-model="inputForm.financeInvoiceInvalidDTO.remarks" show-word-limit></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <!--        附件-->

src/views/modules/cw/invoice/InvoiceFormTaskInvalid.vue

@@ -37,11 +37,11 @@
               <el-input :readonly="true" placeholder="请填写项目编号" v-model="scope.row.programNo"/>
             </template>
           </vxe-table-column>
-<!--          <vxe-table-column field="clientName" title="委托方" :edit-render="{}">-->
-<!--            <template v-slot:edit="scope">-->
-<!--              <el-input :readonly="true" placeholder="请填写委托方" v-model="scope.row.clientName"/>-->
-<!--            </template>-->
-<!--          </vxe-table-column>-->
+          <!--          <vxe-table-column field="clientName" title="委托方" :edit-render="{}">-->
+          <!--            <template v-slot:edit="scope">-->
+          <!--              <el-input :readonly="true" placeholder="请填写委托方" v-model="scope.row.clientName"/>-->
+          <!--            </template>-->
+          <!--          </vxe-table-column>-->
           <!--            <vxe-table-column field="reportNo" title="报告号" :edit-render="{}">-->
           <!--              <template v-slot:edit="scope">-->
           <!--                <el-input v-model="scope.row.reportNo" placeholder="请填写报告号"/>-->
@@ -375,102 +375,102 @@
       </el-divider>
       <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="true"
                label-width="160px" @submit.native.prevent>
-      <el-row  :gutter="15">
-        <vxe-table
-          border
-          show-overflow
-          show-footer
-          ref="detailTable"
-          class="vxe-table-element"
-          :data="inputForm.financeInvoiceDetailDTOList"
-          style="margin-left: 5em"
-          @cell-click=""
-          @edit-closed=""
-          highlight-current-row
-          :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true}"
-        >
-          <vxe-table-column field="code" title="发票代码" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input v-model="scope.row.code" placeholder="请填写发票代码"/>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="number" title="发票号" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input
-                oninput ="value=value.replace(/\D|^/g,'')"
-                placeholder="请填写发票号"
-                maxlength="8"
-                @blur="checkNumber(scope.row,scope.$rowIndex)"
-                v-model="scope.row.number"
-                clearable>
-              </el-input>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="account" title="开票金额(元)" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input-number
-                @blur="checkAccount(scope.row,scope.$rowIndex)"
-                v-model="scope.row.account"
-                controls-position="right"
-                :controls="false"
-                style="width:100%;"
-                :max="999999999999999"
-                :precision="2"
-                placeholder="请填写开票金额"
-                :step="0.01"
-                :min="0"
-                clearable>
-              </el-input-number>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="rate" title="税率(%)" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input-number
-                @blur="checkRate(scope.row, scope.$rowIndex)"
-                v-model="scope.row.rate"
-                controls-position="right"
-                :controls="false"
-                style="width:100%;"
-                :precision="2"
-                placeholder="请填写税率"
-                :step="0.01"
-                :min="0"
-                clearable>
-              </el-input-number>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="amount" title="金额" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input :readonly="true" v-model="scope.row.amount" placeholder="请填写金额"/>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="tax" title="税额" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input :readonly="true" v-model="scope.row.tax" placeholder="请填写税额"/>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="allAmount" title="累计登记金额" :edit-render="{}">
-            <template v-slot:edit="scope">
-              <el-input-number
-                v-model="scope.row.allAmount"
-                controls-position="right"
-                :controls="false"
-                style="width:100%;"
-                :precision="2"
-                placeholder="请填写累计登记金额"
-                :step="0.01"
-                :min="0"
-                clearable>
-              </el-input-number>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column title="操作" width="100">
-            <template v-slot="scope">
-              <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
-            </template>
-          </vxe-table-column>
-        </vxe-table>
-      </el-row>
+        <el-row  :gutter="15">
+          <vxe-table
+            border
+            show-overflow
+            show-footer
+            ref="detailTable"
+            class="vxe-table-element"
+            :data="inputForm.financeInvoiceDetailDTOList"
+            style="margin-left: 5em"
+            @cell-click=""
+            @edit-closed=""
+            highlight-current-row
+            :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true}"
+          >
+            <vxe-table-column field="code" title="发票代码" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input v-model="scope.row.code" placeholder="请填写发票代码"/>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="number" title="发票号" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input
+                  oninput ="value=value.replace(/\D|^/g,'')"
+                  placeholder="请填写发票号"
+                  maxlength="8"
+                  @blur="checkNumber(scope.row,scope.$rowIndex)"
+                  v-model="scope.row.number"
+                  clearable>
+                </el-input>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="account" title="开票金额(元)" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input-number
+                  @blur="checkAccount(scope.row,scope.$rowIndex)"
+                  v-model="scope.row.account"
+                  controls-position="right"
+                  :controls="false"
+                  style="width:100%;"
+                  :max="999999999999999"
+                  :precision="2"
+                  placeholder="请填写开票金额"
+                  :step="0.01"
+                  :min="0"
+                  clearable>
+                </el-input-number>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="rate" title="税率(%)" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input-number
+                  @blur="checkRate(scope.row, scope.$rowIndex)"
+                  v-model="scope.row.rate"
+                  controls-position="right"
+                  :controls="false"
+                  style="width:100%;"
+                  :precision="2"
+                  placeholder="请填写税率"
+                  :step="0.01"
+                  :min="0"
+                  clearable>
+                </el-input-number>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="amount" title="金额" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input :readonly="true" v-model="scope.row.amount" placeholder="请填写金额"/>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="tax" title="税额" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input :readonly="true" v-model="scope.row.tax" placeholder="请填写税额"/>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="allAmount" title="累计登记金额" :edit-render="{}">
+              <template v-slot:edit="scope">
+                <el-input-number
+                  v-model="scope.row.allAmount"
+                  controls-position="right"
+                  :controls="false"
+                  style="width:100%;"
+                  :precision="2"
+                  placeholder="请填写累计登记金额"
+                  :step="0.01"
+                  :min="0"
+                  clearable>
+                </el-input-number>
+              </template>
+            </vxe-table-column>
+            <vxe-table-column title="操作" width="100">
+              <template v-slot="scope">
+                <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
+              </template>
+            </vxe-table-column>
+          </vxe-table>
+        </el-row>
       </el-form>
       <el-divider content-position="left"><i class="el-icon-document"></i>
         收款明细
@@ -527,16 +527,16 @@
       <el-divider content-position="left"><i class="el-icon-document"></i>发票作废</el-divider>
       <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail'"
                label-width="160px" @submit.native.prevent>
-      <el-row :gutter="15">
-        <el-col :span="24">
-          <el-form-item label="作废原因" prop="financeInvoiceInvalidDTO.remarks"
-                        :rules="[
+        <el-row :gutter="15">
+          <el-col :span="24">
+            <el-form-item label="作废原因" prop="financeInvoiceInvalidDTO.remarks"
+                          :rules="[
                         {required: true, message:'作废原因不能为空', trigger:'blur'}
                ]">
-            <el-input maxlength="500" type="textarea" placeholder="请填写作废原因" v-model="inputForm.financeInvoiceInvalidDTO.remarks" show-word-limit></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
+              <el-input maxlength="500" type="textarea" placeholder="请填写作废原因" v-model="inputForm.financeInvoiceInvalidDTO.remarks" show-word-limit></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </el-form>
     <!--        附件-->

src/views/modules/cw/projectRecords/ProjectMembersList.vue

@@ -29,7 +29,7 @@
     <div class="bg-white top" style="">
       <vxe-toolbar :refresh="{query: refreshList}" custom>
         <template #buttons>
-<!--          <el-button v-if="hasPermission('cwProjectRecords:add')" type="primary" size="small" icon="el-icon-plus" @click="add()">新建</el-button>-->
+          <!--          <el-button v-if="hasPermission('cwProjectRecords:add')" type="primary" size="small" icon="el-icon-plus" @click="add()">新建</el-button>-->
           <!--          <el-button v-if="hasPermission('klg:question:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.questionsTable && $refs.questionsTable.getCheckboxRecords().length === 0" plain>删除</el-button>-->
         </template>
       </vxe-toolbar>

src/views/modules/cw/reportManagement/ReportManagementForm.vue

@@ -406,15 +406,15 @@
 <!--                  &lt;!&ndash;                <el-input size="medium" v-model="inputForm.reportTitleType" placeholder="请填写报告类型及标题"></el-input>&ndash;&gt;-->
 <!--                </el-form-item>-->
 <!--              </el-col>-->
-              <el-col :span="12">
-                <el-form-item label="报告编号" prop="reportReviewNo"
-                              :rules="[
-                   ]">
-                  <el-input size="medium" :disabled="true" v-model="inputForm.reportReviewNo" placeholder="自动生成">
-                    <!--                  <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>-->
-                  </el-input>
-                </el-form-item>
-              </el-col>
+<!--              <el-col :span="12">-->
+<!--                <el-form-item label="报告编号" prop="reportReviewNo"-->
+<!--                              :rules="[-->
+<!--                   ]">-->
+<!--                  <el-input size="medium" :disabled="true" v-model="inputForm.reportReviewNo" placeholder="自动生成">-->
+<!--                    &lt;!&ndash;                  <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>&ndash;&gt;-->
+<!--                  </el-input>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
 
 <!--              <el-col :span="12">-->
 <!--                <el-form-item label="创建人" prop="userName"-->

src/views/modules/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -319,14 +319,14 @@
               <el-form-item label="公司注册地址" prop="registerAddress"
                             :rules="[
                    ]">
-                <el-input :disabled="true" v-model="inputForm.registerAddress" placeholder="请填写公司注册地址" clearable>
+                <el-input v-model="inputForm.registerAddress" placeholder="请填写公司注册地址" clearable>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="业务所在地" prop="businessLocation"
                             :rules="[]">
-                <el-input :disabled="true" v-model="inputForm.businessLocation" placeholder="请填写业务所在地" clearable>
+                <el-input v-model="inputForm.businessLocation" placeholder="请填写业务所在地" clearable>
                 </el-input>
               </el-form-item>
             </el-col>

src/views/modules/cw/workContract/ContractNameForm.vue

@@ -109,6 +109,7 @@
               <el-col :span="12">
                 <el-form-item label="付款方式" prop="paymentMethod"
                               :rules="[
+                                {required: true, message: '付款方式不能为空', trigger: 'change'}
                        ]">
                   <el-select v-model="inputForm.paymentMethod" placeholder="请选择付款方式" style="width:100%;">
                     <el-option

src/views/modules/cw/workContract/contractRegisitionAddForm/ContractAddForm.vue

@@ -113,6 +113,7 @@
         <el-col :span="12">
           <el-form-item label="付款方式" prop="paymentMethod"
                         :rules="[
+                          {required: true, message: '付款方式不能为空', trigger: 'change'}
                  ]">
             <el-select v-model="inputForm.paymentMethod" placeholder="请选择付款方式" style="width:100%;">
               <el-option

src/views/modules/flowable/task/NoticePageList.vue

@@ -17,8 +17,8 @@
       <div class="top bg-white">
         <vxe-toolbar :refresh="{query: refreshList}" custom>
           <template #buttons>
-            <el-button v-if="hasPermission('knowledgeShare:info:add')" type="primary" size="small" @click="add()">全部标记已读</el-button>
-            <el-button v-if="hasPermission('knowledgeShare:info:add')" type="primary"  size="small" @click="del()">标记为已读</el-button>
+            <el-button type="primary" size="small" @click="add()">全部标记已读</el-button>
+            <el-button type="primary"  size="small" @click="del()">标记为已读</el-button>
           </template>
         </vxe-toolbar>
 

src/views/modules/materialManagement/wareHouse/WareHouseAddForm.vue

@@ -4,7 +4,7 @@
       :title="title"
       :close-on-click-modal="false"
       v-dialogDrag
-      width="1200px"
+      width="1500px"
       @close="close"
       @keyup.enter.native="doSubmit"
       :visible.sync="visible">
@@ -119,7 +119,7 @@
 <!--                <el-input v-model="scope.row.procurementType" @focus="typePullForm(scope.$rowIndex)"></el-input>-->
               </template>
             </vxe-table-column>
-            <vxe-table-column field="tradeName" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
+            <vxe-table-column field="tradeName" width="250" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
               <template v-slot:edit="scope">
                 <el-input :disabled='true' v-model="scope.row.tradeName"></el-input>
               </template>
@@ -154,7 +154,7 @@
                 <el-input :disabled='true' v-model="scope.row.remarks" ></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column title="操作">
+            <vxe-table-column title="操作" width="180">
               <template v-slot="scope">
                 <el-button size="mini" type="primary" :disabled="false" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>
                 <!--              <el-button size="mini" v-if="formReadOnly" :disabled="false" type="primary" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>-->
@@ -198,9 +198,9 @@
                 <el-input v-model="scope.row.wareHouseType" @focus="typePullForm(scope.$rowIndex)"></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column field="tradeName" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
+            <vxe-table-column field="tradeName" width="250" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.tradeName"></el-input>
+                <el-input maxlength="64" v-model="scope.row.tradeName"></el-input>
               </template>
             </vxe-table-column>
             <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
@@ -220,18 +220,18 @@
             </vxe-table-column>
             <vxe-table-column field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.company"></el-input>
+                <el-input maxlength="64" v-model="scope.row.company"></el-input>
               </template>
             </vxe-table-column>
             <vxe-table-column field="remarks" title="备注" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.remarks" ></el-input>
+                <el-input maxlength="255" v-model="scope.row.remarks" ></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column title="操作" width="300">
+            <vxe-table-column title="操作" width="180">
               <template v-slot="scope">
-                <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
-                <el-button size="mini" type="primary" @click="sss2(scope.$rowIndex)">上传附件</el-button>
+                <el-button size="mini" type="danger" v-if="method!=='view'" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
+                <el-button size="mini" type="primary" v-if="method!=='view'" @click="sss2(scope.$rowIndex)">上传附件</el-button>
                 <el-button size="mini" type="primary" v-if="method==='view'" :disabled="false" @click="seeFileInfo2(scope.$rowIndex)">查看文件详情</el-button>
                 <!--              <el-button size="mini" v-if="formReadOnly" :disabled="false" type="primary" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>-->
               </template>