Merge remote-tracking branch 'origin/develop' into develop

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -510,12 +510,12 @@
                     </el-form-item>
                     <el-form-item
                             label="企标编号"
-                            prop="standCode"
+                            prop="standNumber"
                             label-width="150px"
                             class="add-form-item"
                     >
                         <el-input
-                                v-model="sarBussionessStandEO.standCode"
+                                v-model="sarBussionessStandEO.standNumber"
                                 :maxlength="100"
                                 placeholder="请输入企标编号"
                                 clearable
@@ -2993,6 +2993,7 @@ export default {
                 if (nowstandinfo.firstPutTime != null && nowstandinfo.firstPutTime !== '') {
                   nowstandinfo.firstPutTime = this.$dateFormat(this.sarBussionessStandEO.firstPutTime, 'yyyy-MM-dd hh:mm:ss')
                 }
+                nowstandinfo.standCode = nowstandinfo.standSort + ' ' + nowstandinfo.standNumber + ( nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
                 this.$http.postData('lawss/sarBussionessStand/updateSarBussionessStand', nowstandinfo, {
                   _this: this,
                   loading: 'isSubmit'