Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/api/client/maintenanceEnterprise.js

@@ -4,7 +4,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/crm/yxtcrm/v1/maintenanceEnterprise/listPage',
+      url: '/yxtcrm/v1//maintenanceEnterprise/listPage',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -13,7 +13,7 @@ export default {
   // 初始化
   init(data) {
     return request({
-      url: '/crm/yxtcrm/v1/maintenanceEnterprise/init',
+      url: '/yxtcrm/v1//maintenanceEnterprise/init',
       method: 'get',
       params: data
     })
@@ -21,13 +21,13 @@ export default {
   // 编辑回显
   fetchDetailsBySid: function(data) {
     return request({
-      url: '/crm/yxtcrm/v1/maintenanceEnterprise/fetchDetailsBySid/' + data,
+      url: '/yxtcrm/v1//maintenanceEnterprise/fetchDetailsBySid/' + data,
       method: 'get'
     })
   },
   saveOrUpdate: function(data) {
     return request({
-      url: '/crm/yxtcrm/v1/maintenanceEnterprise/save',
+      url: '/yxtcrm/v1//maintenanceEnterprise/save',
       method: 'post',
       data: data,
       headers: { 'Content-Type': 'application/json' }
@@ -35,7 +35,7 @@ export default {
   },
   deleteBySids: function(data) {
     return request({
-      url: '/crm/yxtcrm/v1/maintenanceEnterprise/delBySids',
+      url: '/yxtcrm/v1//maintenanceEnterprise/delBySids',
       method: 'DELETE',
       data: data,
       headers: { 'Content-Type': 'application/json' }
@@ -44,7 +44,7 @@ export default {
   // 提交流程
   submit: function(params) {
     return request({
-      url: '/crm/yxtcrm/v1/maintenanceEnterprise/submit',
+      url: '/yxtcrm/v1//maintenanceEnterprise/submit',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -53,7 +53,7 @@ export default {
   // 流程审批（同意）
   complete: function(params) {
     return request({
-      url: '/crm/yxtcrm/v1/maintenanceEnterprise/complete',
+      url: '/yxtcrm/v1//maintenanceEnterprise/complete',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -62,7 +62,7 @@ export default {
   // 流程审批（加签）
   delegate: function(params) {
     return request({
-      url: '/crm/yxtcrm/v1/maintenanceEnterprise/delegate',
+      url: '/yxtcrm/v1//maintenanceEnterprise/delegate',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -71,7 +71,7 @@ export default {
   // 流程审批（驳回）
   reject: function(params) {
     return request({
-      url: '/crm/yxtcrm/v1/maintenanceEnterprise/reject',
+      url: '/yxtcrm/v1//maintenanceEnterprise/reject',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -80,7 +80,7 @@ export default {
   // 流程审批（终止）
   breakProcess: function(params) {
     return request({
-      url: '/crm/yxtcrm/v1/maintenanceEnterprise/breakProcess',
+      url: '/yxtcrm/v1//maintenanceEnterprise/breakProcess',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -89,7 +89,7 @@ export default {
   // 流程审批（撤回）
   revokeProcess: function(params) {
     return request({
-      url: '/crm/yxtcrm/v1/maintenanceEnterprise/revokeProcess',
+      url: '/yxtcrm/v1//maintenanceEnterprise/revokeProcess',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -98,7 +98,7 @@ export default {
   // 审批流程（同意）获取下一环节
   getNextNodesForSubmit: function(data) {
     return request({
-      url: '/crm/yxtcrm/v1/maintenanceEnterprise/getNextNodesForSubmit',
+      url: '/yxtcrm/v1//maintenanceEnterprise/getNextNodesForSubmit',
       method: 'get',
       params: data
     })
@@ -106,7 +106,7 @@ export default {
   // 审批流程（驳回）获取上一环节
   getPreviousNodesForReject: function(data) {
     return request({
-      url: '/crm/yxtcrm/v1/maintenanceEnterprise/getPreviousNodesForReject',
+      url: '/yxtcrm/v1//maintenanceEnterprise/getPreviousNodesForReject',
       method: 'get',
       params: data
     })

yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue

@@ -5,7 +5,7 @@
         <div>{{ viewTitle }}</div>
         <div>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()" v-show="formobj.nodeName !== '结算'">提交</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()" v-show="formobj.nodeName !== '结算' && formobj.nodeName !== '维修'">提交</el-button>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="toSendBack" v-show="formobj.nodeName !== '登记'">退回</el-button>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="confirmCLF()" v-show="formobj.nodeName == '结算' && formobj.subject == '保内'">确认材料费</el-button>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="toPrintSettle()" v-show="formobj.nodeName == '结算'">打印结算单</el-button>

yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue

@@ -132,34 +132,6 @@
     <repairbillAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
     <!-- 详情 -->
     <repairbillInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
-    <!-- 确认工时费比例 -->
-    <el-dialog :visible.sync="dialogVisible" width="70%">
-      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
-        <el-table :key="gsfKey" :data="formobj.list" :index="index" border style="width: 100%">
-          <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
-          <el-table-column prop="serviceItem" label="服务项目" align="center" min-width="180" />
-          <el-table-column prop="manHourFee" label="工时费" align="center" min-width="120" />
-          <el-table-column prop="repairerName" label="维修人" align="center" min-width="200" />
-          <el-table-column label="分配比例" align="center" min-width="150">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.allocationProportionKey" placeholder="请选择" @change="allocationProportionChange($event, scope.row)" clearable filterable>
-                <el-option v-for="item in allocationProportion_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column prop="allotmentAmount" label="分配金额" align="center" min-width="120" />
-          <el-table-column label="备注" align="center" min-width="180">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.remarks" clearable placeholder="" />
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form>
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
-        <el-button size="small" @click="dialogVisible = false">取消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
@@ -184,22 +156,7 @@ export default {
   data() {
     return {
       btndisabled: false,
-      dialogVisible: false,
-      gsfKey: 1,
-      index: 0,
-      formobj: {
-        sid: '',
-        list: []
-      },
-      allocationProportion_list: [],
       btnList: [
-        {
-          type: 'primary',
-          size: 'small',
-          icon: '',
-          btnKey: 'toConfirm',
-          btnLabel: '确认工时费比例'
-        },
         {
           type: 'primary',
           size: 'small',
@@ -297,9 +254,6 @@ export default {
     btnHandle(btnKey) {
       console.log('XXXXXXXXXXXXXXX    ' + btnKey)
       switch (btnKey) {
-        case 'toConfirm':
-          this.toConfirm()
-          break
         case 'toEdit':
           this.toEdit()
           break
@@ -383,32 +337,6 @@ export default {
       }
       this.getList()
     },
-    toConfirm() {
-      // req.detailsByManHourFee(this.sids).then((res) => {
-      //   if (res.success) {
-      //     this.dialogVisible = true
-      //     this.formobj = res.data
-      //   }
-      // })
-    },
-    allocationProportionChange(value, row) {
-      const choose = this.allocationProportion_list.filter((item) => item.dictKey === value)
-      if (choose !== null && choose.length > 0) {
-        row.allocationProportion = choose[0].dictValue
-        row.allotmentAmount = Math.round((parseFloat(row.manHourFee) * parseFloat(row.allocationProportion)) * 100) / 100
-      } else {
-        row.allocationProportion = ''
-        row.allotmentAmount = ''
-      }
-    },
-    handleConfirm() {
-      req.saveByManHourFee(this.formobj).then((res) => {
-        if (res.success) {
-          this.dialogVisible = false
-          this.$message({ showClose: true, type: 'success', message: '保存成功' })
-        }
-      })
-    },
     toEdit() {
       if (this.sids.length === 1) {
         this.viewState = 3