修改了分包管理删除按钮和委托日期显示

pages/meter-subcontract/cannot-sub/MeterCannotSub.vue

@@ -48,7 +48,7 @@
   </div>
 </template>
 <script>
-import { meterSubContract, meterSubcontractor } from '../../../api'
+import { meterSubContract } from '../../../api'
 import MeterSubcontractorEdit from './MeterCannotSubEdit'
 export default {
   components: { MeterSubcontractorEdit },
@@ -242,7 +242,7 @@ export default {
       }
     },
     _delete: async function(ids) {
-      const result = await meterSubcontractor.deleteById(ids)
+      const result = await meterSubContract.deleteById(ids)
       if (result) {
         this._formSearch()
         this.$Message.success('删除成功！')

pages/meter-subcontract/cannot-sub/MeterCannotSubEdit.vue

@@ -5,18 +5,18 @@
       <div>
         <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
           <Form-item  label="委托单位" prop="client" class="width-48">
-            <AutoComplete :value="formObj.client" :down-data="customerData" name="client"
-                          placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange"
+            <AutoComplete :value="formObj.client" :down-data="customerData" @on-result-change="_cusNameChange"
+                          name="client" placeholder="请输入或选择委托单位"
             ></AutoComplete>
           </Form-item>
           <Form-item label="委托时间：" prop="edate" class="width-48">
-            <Date-picker v-model="formObj.edate" type="date" split-panels style="width:100%;" placeholder="请选择委托时间"
-                         @on-change="_etimeChange"></Date-picker>
+            <Date-picker v-model="formObj.edate" @on-change="_etimeChange" type="date" split-panels style="width:100%;"
+                         placeholder="请选择委托时间"></Date-picker>
           </Form-item>
 
           <Form-item label="要求完成时间：" prop="odate" class="width-48">
-            <Date-picker v-model="formObj.odate" type="date" split-panels style="width:100%;" placeholder="请选择要求完成时间"
-                         @on-change="_ctimeChange"></Date-picker>
+            <Date-picker v-model="formObj.odate" @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
+                         placeholder="请选择要求完成时间"></Date-picker>
           </Form-item>
 
 
@@ -33,8 +33,8 @@
           </Form-item>
 
           <Form-item label="分包时间：" prop="subTime" class="width-48">
-            <Date-picker v-model="formObj.subTime" type="date" split-panels style="width:100%;" placeholder="请选择分包时间"
-                         @on-change="_subTimeChange"></Date-picker>
+            <Date-picker v-model="formObj.subTime" @on-change="_subTimeChange" type="date" split-panels style="width:100%;"
+                         placeholder="请选择分包时间"></Date-picker>
           </Form-item>
 
           <Form-item label="分包费用：" prop="subFee" class="width-48">
@@ -50,8 +50,8 @@
         <!--操作-->
         <Col span="24">
 
-          <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
-                    @on-result-change="_btnClick"></btn-list>
+          <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
+                    class="contHide"></btn-list>
         </Col>
         <Col span="24">
           <PTVXETable
@@ -73,7 +73,7 @@
             >
               <template slot-scope="scope">
                 <div v-if="item.key==='name'" @click.stop="_handleRow(scope)">
-                  <el-input v-model="scope.row.name" blur placeholder="请输入或选择样品名称"   @click.native="_selectjudgeBasis(scope.$rowIndex)"
+                  <el-input v-model="scope.row.name" @click.native="_selectjudgeBasis(scope.$rowIndex)" blur   placeholder="请输入或选择样品名称"
                   ></el-input>
                 </div>
                 <div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
@@ -106,10 +106,10 @@
                 <div v-if="item.key==='quantity'" @click.stop="_handleRow(scope)" >
                   <el-input
                     v-model="scope.row.quantity"
-                    type="number"
-                    placeholder="请输入或选择数量"
                     @blur="_quantityChange(scope.$rowIndex)"
                     @keydown.native="channelInputLimit"
+                    type="number"
+                    placeholder="请输入或选择数量"
                   />
                 </div>
 
@@ -139,8 +139,8 @@
         <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
       </div>
     </Modal>
-    <EditModal ref="EditModal" is-change @on-result-change="_backData" />
-    <importModal ref="importModal" aptitude-item   @on-result-change="_inputBack"></importModal>
+    <EditModal ref="EditModal" @on-result-change="_backData" is-change />
+    <importModal ref="importModal" @on-result-change="_inputBack"   aptitude-item></importModal>
   </div>
 </template>
 <script>
@@ -299,6 +299,8 @@ export default {
         // this.formObj.customer.cname = data
       }
     },
+    _subTimeChange() {},
+    _etimeChange() {},
     _customerMatch(data) {
       // this.formObj.client = data
       this._getQueryList(data)

pages/meter-subcontract/subpackage-input/MeterSubpackageInput.vue

@@ -226,9 +226,9 @@ export default {
       this.$refs.FileManage._open(id, 'subcontractorId')
     },
     _getById: async function(id) {
-      const result = await meterSubcontractor.getById(id)
+      const result = await meterEntrust.getVOById(id)
       if (result) {
-        this.$refs.editSubcontractorModal._open(result)
+        // this.$refs.editSubcontractorModal._open(result)
       }
     },
     _delete: async function(ids) {

pages/meter-subcontract/subpackage-input/MeterSubpackageInputHis.vue

@@ -34,7 +34,9 @@
                 :min-width="item.width?item.width:200"
                 :fixed="item.fixed?item.fixed:undefined" sortable>
                 <template slot-scope="scope">
-                  <span>{{scope.row[item.key]}}</span>
+                  <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
+                  </span>
+                  <span v-else>{{scope.row[item.key]}}</span>
                 </template>
               </vxe-table-column>
             </PTVXETable>

pages/meter-subcontract/subpackage-task/MeterSubpackageTask.vue

@@ -231,9 +231,10 @@ export default {
       this.$refs.FileManage._open(id, 'subcontractorId')
     },
     _getById: async function(id) {
-      const result = await meterSubcontractor.getById(id)
+      const result = await meterEntrust.getVOById(id)
+      console.log(result)
       if (result) {
-        this.$refs.editSubcontractorModal._open(result)
+        // this.$refs.editSubcontractorModal._open(result)
       }
     },
     _delete: async function(ids) {

pages/meter-subcontract/subpackage-task/MeterSubpackageTaskHis.vue

@@ -37,7 +37,9 @@
                 :min-width="item.width?item.width:200"
                 :fixed="item.fixed?item.fixed:undefined" sortable>
                 <template slot-scope="scope">
-                  <span>{{scope.row[item.key]}}</span>
+                   <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
+                  </span>
+                  <span v-else>{{scope.row[item.key]}}</span>
                 </template>
               </vxe-table-column>
             </PTVXETable>