修改完成

src/dashoo.cn/frontend_web/nuxt.config.js

@@ -172,9 +172,9 @@ module.exports = {
 
   axios: {
     // baseURL: '//192.168.1.44:10091/api/' // 本机开发使用
-     // baseURL: '//localhost:10091/api/' // 本机开发使用
+     baseURL: '//localhost:10091/api/' // 本机开发使用
     // baseURL: '//192.168.1.41:10091/api/' // 本机开发使用
-    baseURL: '//192.168.124.13:10091/api/' // 本机开发使用
+    // baseURL: '//192.168.124.13:10091/api/' // 本机开发使用
 
     /* --------Nuxt Start发版用 START-------------- */
     // baseURL: '/api/'

src/dashoo.cn/frontend_web/src/pages/index.vue

@@ -1009,9 +1009,17 @@
           case '6':
             return '待交费'
           case '7':
-            return '待入库'
+            if(type == '10' || type == '11'){
+              return '待企管法规处审批'
+            }else{
+              return '待入库'
+            }
           case '8':
+          if(type == '10' || type == '11'){
+            return '已完成'
+          }else{
             return '已入库'
+          }
           case '9':
             return '待企管法规处审批'
           case '10':

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/_opera/evaluate.vue

@@ -16,7 +16,7 @@
         <span style="float: right;">
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='7'&&auditBtn" @click="commonAuditClick(7)">企管法规处审批</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='4'&&auditBtn" @click="commonAuditClick(4)">专业处室审核</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业科室接收</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业处室分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='2'&&auditBtn" @click="commonAuditClick(2)">复审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='1'&&auditBtn" @click="commonAuditClick(1)">初审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="Number(formData.Status)<=0&&formData.Id!=0" @click="commonAuditClick(0)">提交审核</el-button>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/_opera/evaluate.vue

@@ -16,7 +16,7 @@
         <span style="float: right;">
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='7'&&auditBtn" @click="commonAuditClick(7)">企管法规处审批</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='4'&&auditBtn" @click="commonAuditClick(4)">专业处室审核</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业科室接收</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业处室分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='2'&&auditBtn" @click="commonAuditClick(2)">复审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='1'&&auditBtn" @click="commonAuditClick(1)">初审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="Number(formData.Status)<=0&&formData.Id!=0" @click="commonAuditClick(0)">提交审核</el-button>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-import/_opera/operation.vue

@@ -331,6 +331,7 @@
           ],
           Telephone:[
             { required: true, message: '请输入联系人电话', trigger: 'blur' },
+            { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不对' }
           ],
           ProjectType:[
             { required: true, message: '请选择项目类别', trigger: 'change' },

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service/_opera/evaluate.vue

@@ -16,7 +16,7 @@
         <span style="float: right;">
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='7'&&auditBtn" @click="commonAuditClick(7)">企管法规处审批</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='4'&&auditBtn" @click="commonAuditClick(4)">专业处室审核</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业科室接收</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业处室分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='2'&&auditBtn" @click="commonAuditClick(2)">复审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='1'&&auditBtn" @click="commonAuditClick(1)">初审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="Number(formData.Status)<=0&&formData.Id!=0" @click="commonAuditClick(0)">提交审核</el-button>