Merge branch 'main' of http://222.71.165.188:3000/linkage/SC-MOM

SC-web/src/views/scm/basicInformation/contractfile/index.vue

@@ -25,8 +25,8 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <!--						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
+            						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
-            <!--						</el-button>-->
+            						</el-button>
             <!--            <el-button type="text" icon="=el-icon-detail" @click="goDetail(scope.row.id)">查看-->
             <!--            </el-button>-->
             <el-button type="text" icon="el-icon-download" @click="exportData()">导出

SC-web/src/views/scm/basicInformation/payment/index.vue

@@ -80,6 +80,14 @@
               </el-button>
               <el-button type="text" @click="goDetail(scope.row.id)">详情
               </el-button>
+              <el-button type="text" @click="">撤回申请
+              </el-button>
+              <el-button type="text" @click="">审核
+              </el-button>
+              <el-button type="text" @click="">弃审
+              </el-button>
+              <el-button type="text" @click="">提交
+              </el-button>
             </template>
           </el-table-column>
         </JNPF-table>

SC-web/src/views/scm/basicInformation/saleorder/Form.vue

@@ -142,7 +142,7 @@
                             :bissId="dataForm.contractCode" :columnOptions="salesorder_item0licenseNumcolumnOptions"
                             propsValue="license_no" relationField="license_no" popupType="dialog"
                             @change="popupSelectChange2" popupWidth="800px">
-  
+
                        </popupSelect>
                         </template>
                       </el-table-column>