Merge branch 'dev_tide' into dev_tide_cbsglxt

zouyu

2 天以前 8bc17a9ea84a6af0b7d01e451c702f404a3ff895

 src/views/procurementManagement/paymentEntry/index.vue

@@ -61,6 +61,7 @@
                  show-summary
                  v-loading="childrenLoading"
                  :summary-method="summarizeMainTable2"
                  stripe
               >
                  <el-table-column
                     align="center"
@@ -82,15 +83,12 @@
                  </el-table-column>
                  <el-table-column label="付款方式" prop="paymentMethod">
                     <template #default="scope">
                        <el-select
                        <el-input
                           :disabled="!scope.row.editType"
                           v-model="scope.row.paymentMethod"
                           placeholder="请选择"
                           placeholder="请输入"
                           clearable
                        >
                           <el-option label="电汇" value="电汇" />
                           <el-option label="承兑" value="承兑" />
                        </el-select>
                        />
                     </template>
                  </el-table-column>
                  <el-table-column label="登记人" prop="registrant" />
@@ -211,41 +209,38 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="付款方式：" prop="paymentMethod">
              <el-select
                v-model="form.paymentMethod"
                placeholder="请选择"
                clearable
              >
                <el-option label="电汇" value="电汇" />
                <el-option label="承兑" value="承兑" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="登记人：" prop="registrant">
              <el-input
                v-model="form.registrant"
                v-model="form.paymentMethod"
                placeholder="请输入"
                clearable
                disabled
              />
            </el-form-item>
          </el-col>
               <el-col :span="12">
                  <el-form-item label="付款日期：" prop="paymentDate">
                     <el-date-picker
                        style="width: 100%"
                        v-model="form.paymentDate"
                        value-format="YYYY-MM-DD"
                        format="YYYY-MM-DD"
                        type="date"
                        placeholder="请选择"
                        clearable
                     />
                  </el-form-item>
               </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="付款日期：" prop="paymentDate">
              <el-date-picker
                style="width: 100%"
                v-model="form.paymentDate"
                value-format="YYYY-MM-DD"
                format="YYYY-MM-DD"
                type="date"
                placeholder="请选择"
                clearable
              />
            </el-form-item>
          </el-col>
               <el-col :span="12">
                  <el-form-item label="登记人：" prop="registrant">
                     <el-input
                        v-model="form.registrant"
                        placeholder="请输入"
                        clearable
                        disabled
                     />
                  </el-form-item>
               </el-col>
          <el-col :span="12">
            <el-form-item label="登记日期：" prop="registrationtDate">
              <el-input