1.合同管理新增加备注字段；2.备件申购问题修改

src/views/custom/contractManagement/index.vue

@@ -2348,8 +2348,8 @@ export default {
           this.$nextTick(() => {
             const ExcelDatas = [
               {
-                tHeader: ['备件编号', '备件名称', '备件规格', '备件品牌', '计量单位', '计划量', '单价', '备注'],
-                filterVal: ['partCode', 'partName', 'specification', 'brand', 'unit', 'planAmount', 'price', 'remark'],
+                tHeader: ['备件编号', '备件名称', '备件规格', '备件品牌', '计量单位', '计划量', '单价', '使用周期', '合同差异项', '备注'],
+                filterVal: ['partCode', 'partName', 'specification', 'brand', 'unit', 'planAmount', 'price','lifeCycle','contractVarianceItem', 'remark'],
                 tableDatas: response.data.list,
                 sheetName: '合同管理-备件明细'
               }

src/views/custom/subscribe/index.vue

@@ -70,23 +70,13 @@
           <span>{{ scope.row.pastureName }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="申购部门" min-width="80px" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.departmentName }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="申购人" min-width="80px" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.empname }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="申购日期" sortable prop="inputTime" min-width="80px" align="center" />
       <el-table-column label="申购状态" min-width="80px" align="center">
         <template slot-scope="scope">
-          <span v-if="scope.row.purchase_type == 1">暂估</span>
-          <span v-else-if="scope.row.purchase_type == 3">赠品</span>
-          <span v-else>正常</span>
+          <span v-if="scope.row.purchase_type == 1">暂估申购</span>
+          <span v-else-if="scope.row.purchase_type == 3">赠品申购</span>
+          <span v-else-if="scope.row.departmentName == '挤奶处'">奶厅申购</span>
+          <span v-else>新增申购</span>
         </template>
       </el-table-column>
       <el-table-column label="审核状态" min-width="80px" align="center" :formatter="statue" />
@@ -121,7 +111,7 @@
           <!-- 奶厅 -->
           <el-button v-if="isSubscribeExamineNT && row.departmentName == '挤奶处' && (row.examine !== 1 && row.statue == 5 || row.statue == 11) " style="display:inline-block" type="success" size="mini" @click="handleExamine7(row)">奶厅</el-button>
 
-          <el-button v-if="isSubscribeDelete && (row.statue == 4||row.statue == 6||row.statue == 8||row.statue == 12)" style="display:inline-block" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
+          <el-button v-if="isSubscribeDelete && (row.statue == 4||row.statue == 6||row.statue == 8||row.statue == 12 ||row.statue == 14 ||row.statue == 16)" style="display:inline-block" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
 
 
 
@@ -172,7 +162,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="申购日期：" prop="createTime">
-                <el-date-picker v-model="createTemp.createTime" :picker-options="pickerOptions" type="date" placeholder="申购日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width:100%" :disabled="dialogStatus==='update'" />
+                <el-date-picker v-model="createTemp.createTime" :picker-options="pickerOptions" type="datetime" placeholder="申购日期" style="width:100%" :disabled="dialogStatus==='update'" />
               </el-form-item>
             </el-col>
             <el-col v-if="dialogStatus==='create'" :span="8">
@@ -334,7 +324,7 @@
         <div slot="footer" class="dialog-footer" style="bottom:10px">
           <el-button type="primary" :disabled="isokDisable" v-if="dialogStatus==='create'" @click="add_dialog_save()">保存并关闭</el-button>
           <el-button type="primary" :disabled="isokDisable" v-else-if="dialogStatus==='update'" @click="edit_dialog_save()">保存并关闭</el-button>
-          <el-button @click="dialogFormVisible = false;get_table_data();createTemp.partCode=''">取消并关闭</el-button>
+          <el-button @click="dialogFormVisible = false;get_table_data();">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -380,7 +370,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="申购日期：" prop="createTime">
-                <el-date-picker v-model="createTemp.createTime" :picker-options="pickerOptions" type="date" placeholder="申购日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width:100%" :disabled="dialogStatus==='update'" />
+                <el-date-picker v-model="createTemp.createTime" :picker-options="pickerOptions" type="datetime" placeholder="申购日期" style="width:100%" :disabled="dialogStatus==='update'" />
               </el-form-item>
             </el-col>
             <el-col v-if="dialogStatus==='special' && createTemp.purchaseType == '1' || createTemp.purchaseType == '3'" :span="8">
@@ -406,7 +396,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="dialogStatus==='special'">
+          <el-row>
             <el-col :span="24">
               <el-form-item label="申购类型：" prop="purchaseType">
                 <el-radio v-model="createTemp.purchaseType" label="1" @change="changeType()">暂估</el-radio>
@@ -476,9 +466,13 @@
               </el-popover>
             </template>
           </el-table-column>
-          <el-table-column label="备件品牌" prop="brand" align="center" min-width="60">
-            <template slot-scope="scope">
-              <span v-if="dialogStatus==='special'">{{ scope.row.brandName }}</span>
+          <el-table-column label="备件品牌" prop="brand" align="center" min-width="160">
+            <template slot-scope="scope">
+              <el-form :model="scope.row" :rules="rules">
+                <el-form-item prop="brandName">
+                  <el-autocomplete v-model="scope.row.brandName" value-key="brandName" class="inline-input" :fetch-suggestions="brandSearch" placeholder="请输入品牌" style="width:100%;" @select="(value)=> {handleSelectBrand(value,scope.row)}" />
+                </el-form-item>
+              </el-form>
             </template>
           </el-table-column>
           <el-table-column label="计量单位" prop="unit" align="center" min-width="60">
@@ -490,28 +484,8 @@
             <template slot-scope="scope">
               <span v-if="createTemp.providerId == '' || parseFloat(createTemp.purchaseType) > 0">{{ scope.row.reportery }}</span>
             </template>
-          </el-table-column>
-          <el-table-column v-if="createTemp.purchaseType == '1'" label="使用周期" min-width="120px" align="center">
-            <template slot-scope="scope">
-              <div v-for="item in scope.row.lifeCyclearr">
-                <el-tooltip class="item" effect="dark" placement="top-start">
-                  <div slot="content">{{item}}</div>
-                  <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
-                </el-tooltip>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column v-if="createTemp.purchaseType == '1'" label="合同差异项" min-width="120px" align="center">
-            <template slot-scope="scope">
-              <div v-for="item in scope.row.contractVarianceItemarr" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
-                <el-tooltip class="item" effect="dark" placement="top-start">
-                  <div slot="content">{{item}}</div>
-                  <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
-                </el-tooltip>
-              </div>
-            </template>
           </el-table-column>
-          <el-table-column  v-if="createTemp.purchaseType == '1'" label="价格" prop="price" align="center" min-width="150">
+          <!-- <el-table-column  v-if="createTemp.purchaseType == '1'" label="价格" prop="price" align="center" min-width="150">
             <template slot-scope="scope">
               <div v-if="createTemp.purchaseType == '1'" v-for="item in scope.row.pricearr" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
                 <el-tooltip class="item" effect="dark" placement="top-start">
@@ -520,8 +494,8 @@
                 </el-tooltip>
               </div>
             </template>
-          </el-table-column>
-          <el-table-column  v-if="createTemp.purchaseType == '3'" label="价格" prop="price" align="center" min-width="150">
+          </el-table-column> -->
+          <el-table-column label="价格" prop="price" align="center" min-width="150">
             <template slot-scope="scope">
               <el-form :model="scope.row" :rules="rules">
                 <el-form-item prop="price">
@@ -538,7 +512,8 @@
                 </el-form-item>
               </el-form>
             </template>
-          </el-table-column>
+          </el-table-column>
+          <el-table-column v-if="createTemp.purchaseType == '1'" label="驳回说明" min-width="110px" align="center" prop="explain1" valign="middle" />
           <el-table-column label="备注" min-width="110px" align="center" valign="middle">
             <template slot-scope="scope">
               <el-input v-model="scope.row.purpose" />
@@ -559,7 +534,7 @@
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
           <el-button type="primary" :disabled="isokDisable" v-if="dialogStatus==='special'" @click="special_dialog_save()">保存并关闭</el-button>
-          <el-button @click="dialogFormVisible2 = false;get_table_data();createTemp.partCode=''">取消并关闭</el-button>
+          <el-button @click="dialogFormVisible2 = false;get_table_data();">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -994,11 +969,12 @@
           <el-table-column label="备件编号" prop="partCode" align="center" min-width="90" />
           <el-table-column label="备件名称" prop="partName" align="center" min-width="90" />
           <el-table-column label="备件规格" prop="specification" min-width="90px" align="center" />
+          <el-table-column label="供应商" prop="providerName" align="center" min-width="60" />
           <el-table-column label="备件品牌" prop="brandName" align="center" min-width="60" />
           <el-table-column label="计量单位" prop="unit" align="center" min-width="60" />
           <el-table-column label="现有库存" sortable prop="storageAmount" align="center" min-width="60" />
           <el-table-column label="申购数量" sortable prop="amount" align="center" min-width="60" />
-          <el-table-column label="价格" min-width="150px" align="center">
+          <el-table-column label="价格" min-width="110px" align="center">
             <template slot-scope="scope">
               <div v-for="item in scope.row.pricearr" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
                 <el-tooltip class="item" effect="dark" placement="top-start">
@@ -1008,7 +984,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="使用周期" min-width="120px" align="center">
+          <el-table-column label="使用周期" min-width="100px" align="center">
             <template slot-scope="scope">
               <div v-for="item in scope.row.lifeCyclearr" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
                 <el-tooltip class="item" effect="dark" placement="top-start">
@@ -1018,7 +994,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="合同差异项" min-width="120px" align="center">
+          <el-table-column label="合同差异项" min-width="100px" align="center">
             <template slot-scope="scope">
               <div v-for="item in scope.row.contractVarianceItemarr" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
                 <el-tooltip class="item" effect="dark" placement="top-start">
@@ -1028,9 +1004,9 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="部门" sortable prop="departmentName" align="center" min-width="60" />
+          <el-table-column label="部门" sortable prop="departmentName" align="center" min-width="80" />
           <el-table-column label="申购人" sortable prop="empname" align="center" min-width="60" />
-          <el-table-column label="申购日期" sortable prop="date" align="center" min-width="60" />
+          <el-table-column label="申购日期" sortable prop="date" align="center" min-width="100" />
           <el-table-column label="备注" min-width="110px" align="center" prop="purpose" />
         </el-table>
         <el-form ref="seeTemp" :rules="rules" :model="seeTemp" label-position="right" label-width="100px" style="width: 90%;margin:0 auto;" >
@@ -1201,7 +1177,8 @@ export default {
         createTime: parseTime(new Date(), '{y}-{m}-{d}'),
         providerId: '',
         purchaseType:'1',
-        funderId:''
+        funderId:'',
+        partCode:''
       },
       requestSparePart: {
         name: 'getPartsListSG',
@@ -1237,7 +1214,9 @@ export default {
       },
       listAdd: [],
       postDataPramas: {},
-      requestParam: {},
+      requestParam: {
+        parammaps:{partCode:''}
+      },
       dialogFormVisible_Examine: false,
       examineTemp: {
         statue: 1
@@ -1283,7 +1262,16 @@ export default {
       modifyTemp:{
         orderNumber:''
       },
-      modifylist:[{}]
+      modifylist:[{}],
+      requestBrand: {
+        name: 'getBrandByPartCode',
+        page: 0,
+        offset: 0,
+        pagecount: 10,
+        returntype: 'Map',
+        parammaps: {}
+      },
+      BrandList: [],
     }
   },
 
@@ -1482,7 +1470,7 @@ export default {
       }
     },
     statue: function(cellValue) {
-      console.log(cellValue)
+      // console.log(cellValue)
       // departmentName
       // purchase_type
       if(cellValue.purchase_type == 1){
@@ -1523,15 +1511,20 @@ export default {
       this.createTemp.departmentId = parseInt(Cookies.get('departmentid'))
       this.createTemp.departmentName = Cookies.get('departmentname')
       this.createTemp.employeId = parseInt(Cookies.get('employeid'))
-      this.createTemp.createTime = parseTime(new Date(), '{y}-{m}-{d}')
+      this.createTemp.createTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
       this.createTemp.orderNumber = ''
       this.createTemp.providerId = ''
       this.createTemp.funderId = ''
-      this.createTemp.partCode = ''
+      this.createTemp.partCode = ''
+      // this.requestSparePart.parammaps['partCode'] = ''
+      this.$set(this.createTemp,'partCode','')
+      // this.$set(this.requestSparePart.parammaps,'partCode','')
       this.createTemp.purchaseType = '1'
       this.listAdd = []
     },
     form_add() {
+      this.getdataListSee.parammaps.id = ''
+      this.textMap.create = '新增'
       this.isMilk = false
       this.seepart.getdataListParm.parammaps.partName = ''
       this.resetCreateTemp()
@@ -1560,13 +1553,32 @@ export default {
           this.createTemp.markBackend = true
           this.createTemp.pastureId = response.data.list[0].pastureId
           this.createTemp.orderNumber = response.data.list[0].orderNumber
-          this.createTemp.createTime = response.data.list[0].inputTime
+          this.createTemp.createTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
           this.createTemp.bigId = response.data.list[0].id
           this.getdataListSee.parammaps.id = response.data.list[0].id
+          if(this.dialogStatus == 'create'){
+            this.getdataListSee.parammaps.purchaseType = 0
+          }else if(this.dialogStatus == 'special'){
+            if(this.createTemp.purchaseType == '1'){
+              this.getdataListSee.parammaps.purchaseType = 1
+            }
+          }
+          this.getdataListSee.parammaps.empId = Cookies.get('employeid')
           this.getSeeList()
         }else{
           this.createTemp.markBackend = false
           this.getCreateNumber()
+          if(this.dialogStatus == 'create'){
+            this.getdataListSee.parammaps.purchaseType = 0
+            this.getdataListSee.parammaps.empId = Cookies.get('employeid')
+            this.getSeeList()
+          }else if(this.dialogStatus == 'special'){
+            if(this.createTemp.purchaseType == '1'){
+              this.getdataListSee.parammaps.purchaseType = 1
+              this.getdataListSee.parammaps.empId = Cookies.get('employeid')
+              this.getSeeList()
+            }
+          }
         }
 
       })
@@ -1574,10 +1586,27 @@ export default {
     getCreateNumber() {
       GetDataByName(this.getParmCreateNumber).then(response => {
         this.$nextTick(() => {
-          console.log('新增申购单号', response.data.list[0].orderCode)
-          this.createTemp.orderNumber = response.data.list[0].orderCode
-          this.modifyTemp.orderNumber = response.data.list[0].orderCode
-          this.$forceUpdate()
+          console.log('新增申购单号', response.data.list[0].orderCode,this.dialogStatus)
+          if(this.createTemp.purchaseType == 3){
+            console.log(111)
+            this.createTemp.orderNumber = response.data.list[0].orderCode
+            this.modifyTemp.orderNumber = response.data.list[0].orderCode
+            this.$forceUpdate()
+          } else if(this.createTemp.purchaseType == 1){
+            console.log(222)
+            if(this.createTemp.orderNumber == ''){
+              this.createTemp.orderNumber = response.data.list[0].orderCode
+              this.modifyTemp.orderNumber = response.data.list[0].orderCode
+              this.$forceUpdate()
+            }
+          }else{
+            console.log(333)
+            // this.textMap.create = '新增'
+            // this.dialogStatus = 'create'
+            this.createTemp.orderNumber = response.data.list[0].orderCode
+            this.modifyTemp.orderNumber = response.data.list[0].orderCode
+            this.$forceUpdate()
+          }
         })
       })
     },
@@ -1605,6 +1634,11 @@ export default {
               this.requestSparePart.parammaps['providerName'] = this.providerList.find(obj => obj.id == this.createTemp.providerId).providerName
               this.requestSparePart.parammaps['providerId'] = this.createTemp.providerId
               this.requestSparePart.parammaps['pastureId'] = this.createTemp.pastureId
+            }else if(this.createTemp.purchaseType == '1'){
+             this.requestSparePart.name = 'getPartsListSGFlex'
+             this.requestSparePart.parammaps.providerId = this.createTemp.providerId
+              this.requestSparePart.parammaps['providerName'] = this.providerList.find(obj => obj.id == this.createTemp.providerId).providerName
+             this.requestSparePart.parammaps.providerName = this.createTemp.providerName
             }else{
               this.requestSparePart.name = 'getPartsListSG'
               this.requestSparePart.parammaps['providerId'] = this.createTemp.providerId
@@ -1621,8 +1655,11 @@ export default {
           this.requestSparePart.parammaps.providerId = this.createTemp.providerId
           this.requestSparePart.parammaps.providerName = this.createTemp.providerName
         }
-      }
+      }
       this.requestSparePart.parammaps['partCode'] = queryString
+      // this.createTemp.partCode = queryString
+      this.$set(this.requestSparePart.parammaps,'partCode',queryString)
+      this.$set(this.createTemp,'partCode',queryString)
       GetDataByName(this.requestSparePart).then(response => {
         console.log('备件模糊查询搜索data', response.data.list)
         if (response.data.list == null) {
@@ -1631,6 +1668,21 @@ export default {
           cb(response.data.list)
         }
       })
+    },
+    brandSearch(queryString, cb) {
+      console.log('品牌模糊查询输入值', queryString)
+      this.requestBrand.parammaps['brandName'] = queryString
+      GetDataByName(this.requestBrand).then(response => {
+        console.log('品牌模糊查询搜索data', response.data.list)
+        this.BrandList = response.data.list
+        cb(this.BrandList)
+      })
+    },
+    handleSelectBrand(item,row) {
+      console.log('品牌模糊查询选中值', item)
+      this.$set(row, 'brandName', item.brandName)
+      this.$set(row, 'brandId', item.brandId)
+      this.$forceUpdate()
     },
     handleSelectSparePart(item) {
       console.log('备件模糊查询选中值', item)
@@ -1910,6 +1962,7 @@ export default {
             }
             let obj = {
               "id": parseFloat(this.listAdd[i].id),
+              "contractId": this.listAdd[i].contractId,
               "bigId": parseFloat(this.createTemp.bigId),
               "pastureId": parseFloat(this.listAdd[i].pastureId),
               "partId": parseFloat(this.listAdd[i].partId),
@@ -1924,7 +1977,7 @@ export default {
               "lifeCycle":  this.listAdd[i].lifeCycle.toString(),
               "contractVarianceItem":  this.listAdd[i].contractVarianceItem.toString(),
               "departmentId": this.createTemp.departmentId.toString(),
-              "date": this.createTemp.createTime.toString(),
+              "date": parseTime(this.createTemp.createTime, '{y}-{m}-{d} {h}:{i}:{s}').toString(),
               "employeId": parseFloat(this.createTemp.employeId)
             }
             if(this.listAdd[i].contractId){
@@ -1974,27 +2027,29 @@ export default {
                 return false
               }
             }
-            if (this.createTemp.providerId !== '') {
-              if (this.listAdd[j].price == '') {
-                this.$message({ type: 'warning', message: '请检查单价是否为空', duration: 2000 })
-                return false
-              } else {
+            if (this.listAdd[j].price == '') {
+              this.$message({ type: 'warning', message: '请检查单价是否为空', duration: 2000 })
+              return false
+            } else {
+              if(this.listAdd[j].contractId == '' || this.listAdd[j].contractId == undefined || parseFloat(this.listAdd[j].contractId) == 0 || parseFloat(this.listAdd[j].contractId) < 0){
                 if (parseFloat(this.listAdd[j].price) == 0) {
                   this.$message({ type: 'warning', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
                   return false
                 } else {
-                  // var rulesPrice = /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/
-                  var rulesPrice = /(^[1-9](\d+)?(\.\d{1,5})?$)|(^\d\.\d{1,5}$)/
-                  if (rulesPrice.test(this.listAdd[j].price) == false) {
-                    this.$message({ type: 'error', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
-                    return false
+                  if(this.listAdd[j].contractId == '' || this.listAdd[j].contractId == undefined || parseFloat(this.listAdd[j].contractId) == 0 || parseFloat(this.listAdd[j].contractId) < 0){
+                    // var rulesPrice = /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/
+                    var rulesPrice = /(^[1-9](\d+)?(\.\d{1,5})?$)|(^\d\.\d{1,5}$)/
+                    if (rulesPrice.test(this.listAdd[j].price) == false) {
+                      this.$message({ type: 'error', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
+                      return false
+                    }
                   }
                 }
               }
             }
           }
           for(let i=0;i<this.listAdd.length;i++){
-            this.$set(this.listAdd[i],'date',this.createTemp.createTime)
+            this.$set(this.listAdd[i],'date',parseTime(this.createTemp.createTime, '{y}-{m}-{d} {h}:{i}:{s}'))
             this.$set(this.listAdd[i],'employeId',this.createTemp.employeId)
             if(this.listAdd[i].reject){
               this.$set(this.listAdd[i],'reject',this.listAdd[i].reject)
@@ -2009,7 +2064,7 @@ export default {
             departmentId: this.createTemp.departmentId,
             orderNumber: this.createTemp.orderNumber,
             useType: this.createTemp.useType,
-            createTime: this.createTemp.createTime,
+            createTime: parseTime(this.createTemp.createTime, '{y}-{m}-{d} {h}:{i}:{s}'),
             employeId: this.createTemp.employeId,
             providerId: this.createTemp.providerId
           }}
@@ -2035,7 +2090,8 @@ export default {
             employeId: '@insertSpotList.employeId',
             reject: '@insertSpotList.reject',
             departmentId: this.createTemp.departmentId,
-            contractVarianceItem: '@insertSpotList.contractVarianceItem'
+            contractVarianceItem: '@insertSpotList.contractVarianceItem',
+            contractId: '@insertSpotList.contractId'
           }}
           ExecDataByConfig(this.postDataPramas).then(response => {
             console.log('新增保存发送参数', this.postDataPramas)
@@ -2106,7 +2162,8 @@ export default {
       this.seeTemp.purchaseType = String(row.purchase_type)
       console.log('查看上方数据(从table读取)', this.seeTemp)
       this.listSee = []
-      this.getdataListSee.parammaps.id = this.seeTemp.id
+      this.getdataListSee.parammaps.id = this.seeTemp.id
+      this.getdataListSee.parammaps.empId = ''
       this.isApplyEx4 = false
       this.getSeeList()
     },
@@ -2192,16 +2249,16 @@ export default {
               this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson  }, { title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson },{ title: '场长审核', date: this.seeTemp.fielddate, name: this.seeTemp.fieldPerson, status: 'error', reason: reason  },{ title: '职能中心审核' },{ title: '采购审核' }]
               this.active = 5
             } else if (this.seeTemp.statue === 15) {
-              this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson },{ title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson },{ title: '场长审核', date: this.seeTemp.fielddate, name: this.seeTemp.fieldPerson },{ title: '职能中心审核', date: this.seeTemp.positionName, name: this.seeTemp.positiondate }, { title: '采购审核' }]
+              this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson },{ title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson },{ title: '场长审核', date: this.seeTemp.fielddate, name: this.seeTemp.fieldPerson },{ title: '职能中心审核', name:this.seeTemp.positionName , date: this.seeTemp.positiondate }, { title: '采购审核' }]
               this.active = 6
             } else if (this.seeTemp.statue === 16) {
-              this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson },{ title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson },{ title: '场长审核', date: this.seeTemp.fielddate, name: this.seeTemp.fieldPerson },{ title: '职能中心审核', date: this.seeTemp.positionName, name: this.seeTemp.positiondate, status: 'error', reason: reason  }, { title: '采购审核' }]
+              this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson },{ title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson },{ title: '场长审核', date: this.seeTemp.fielddate, name: this.seeTemp.fieldPerson },{ title: '职能中心审核', name:this.seeTemp.positionName , date: this.seeTemp.positiondate, status: 'error', reason: reason  }, { title: '采购审核' }]
               this.active = 6
             } else if (this.seeTemp.statue === 7) {
-              this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson },{ title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson },{ title: '场长审核', date: this.seeTemp.fielddate, name: this.seeTemp.fieldPerson },{ title: '职能中心审核', date: this.seeTemp.positionName, name: this.seeTemp.positiondate }, { title: '采购审核', date: this.seeTemp.CGChargedate, name: this.seeTemp.CGChargePerson }]
+              this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson },{ title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson },{ title: '场长审核', date: this.seeTemp.fielddate, name: this.seeTemp.fieldPerson },{ title: '职能中心审核', name:this.seeTemp.positionName , date: this.seeTemp.positiondate }, { title: '采购审核', date: this.seeTemp.CGChargedate, name: this.seeTemp.CGChargePerson }]
               this.active = 7
             } else if (this.seeTemp.statue === 8) {
-              this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson },{ title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson },{ title: '场长审核', date: this.seeTemp.fielddate, name: this.seeTemp.fieldPerson },{ title: '职能中心审核', date: this.seeTemp.positionName, name: this.seeTemp.positiondate }, { title: '采购审核', date: this.seeTemp.CGChargedate, name: this.seeTemp.CGChargePerson, status: 'error', reason: reason }]
+              this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson },{ title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson },{ title: '场长审核', date: this.seeTemp.fielddate, name: this.seeTemp.fieldPerson },{ title: '职能中心审核', name:this.seeTemp.positionName , date: this.seeTemp.positiondate }, { title: '采购审核', date: this.seeTemp.CGChargedate, name: this.seeTemp.CGChargePerson, status: 'error', reason: reason }]
               this.active = 7
             }
           }else{
@@ -2227,16 +2284,16 @@ export default {
               this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson  }, { title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson, status: 'error', reason: reason },{ title: '职能中心审核' },{ title: '采购审核' }]
               this.active = 4
             } else if (this.seeTemp.statue === 15) {
-              this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson },{ title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson },{ title: '职能中心审核', date: this.seeTemp.positionName, name: this.seeTemp.positiondate }, { title: '采购审核' }]
+              this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson },{ title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson },{ title: '职能中心审核', name:this.seeTemp.positionName , date: this.seeTemp.positiondate }, { title: '采购审核' }]
               this.active = 5
             } else if (this.seeTemp.statue === 16) {
-              this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson },{ title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson },{ title: '职能中心审核', date: this.seeTemp.positionName, name: this.seeTemp.positiondate, status: 'error', reason: reason  }, { title: '采购审核' }]
+              this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson },{ title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson },{ title: '职能中心审核', name:this.seeTemp.positionName , date: this.seeTemp.positiondate, status: 'error', reason: reason  }, { title: '采购审核' }]
               this.active = 5
             } else if (this.seeTemp.statue === 7) {
-              this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson },{ title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson },{ title: '职能中心审核', date: this.seeTemp.positionName, name: this.seeTemp.positiondate }, { title: '采购审核', date: this.seeTemp.CGChargedate, name: this.seeTemp.CGChargePerson }]
+              this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson },{ title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson },{ title: '职能中心审核', name:this.seeTemp.positionName , date: this.seeTemp.positiondate }, { title: '采购审核', date: this.seeTemp.CGChargedate, name: this.seeTemp.CGChargePerson }]
               this.active = 6
             } else if (this.seeTemp.statue === 8) {
-              this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson },{ title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson },{ title: '职能中心审核', date: this.seeTemp.positionName, name: this.seeTemp.positiondate }, { title: '采购审核', date: this.seeTemp.CGChargedate, name: this.seeTemp.CGChargePerson, status: 'error', reason: reason }]
+              this.activeList = [{ title: '备件申购', date: this.seeTemp.inputTime, name: this.seeTemp.empname }, { title: '库管审核', date: this.seeTemp.KGChargedate, name: this.seeTemp.KGChargePerson },  { title: '设备主管审核', date: this.seeTemp.equipmentdate, name: this.seeTemp.equipmentPerson },{ title: '供应主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson },{ title: '职能中心审核', name:this.seeTemp.positionName , date: this.seeTemp.positiondate  }, { title: '采购审核', date: this.seeTemp.CGChargedate, name: this.seeTemp.CGChargePerson, status: 'error', reason: reason }]
               this.active = 6
             }
           }
@@ -2287,7 +2344,13 @@ export default {
         this.getdataListSee.parammaps.reject = 1
       }else{
         this.getdataListSee.parammaps.reject = 0
-      }
+        if(this.dialogStatus == 'special'){
+          if(this.createTemp.purchaseType == '1' || this.createTemp.purchaseType == '3'){
+            this.getdataListSee.parammaps.reject = 1
+          }
+        }
+      }
+      this.getdataListSee.parammaps.pastureId = Cookies.get('pastureid')
       GetDataByName(this.getdataListSee).then(response => {
         if (response.data.list !== null) {
           console.log('查看下方table数据', response.data.list)
@@ -2409,27 +2472,28 @@ export default {
               return false
             }
           }
-          if (this.createTemp.providerId !== '') {
-            if (this.listAdd[j].price == '') {
-              this.$message({ type: 'warning', message: '请检查单价是否为空', duration: 2000 })
+          if (this.listAdd[j].price == '') {
+            this.$message({ type: 'warning', message: '请检查单价是否为空', duration: 2000 })
+            return false
+          } else {
+            if (parseFloat(this.listAdd[j].price) == 0) {
+              this.$message({ type: 'warning', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
               return false
-            } else {
-              if (parseFloat(this.listAdd[j].price) == 0) {
-                this.$message({ type: 'warning', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
-                return false
-              } else {
+            } else {
+              console.log(this.listAdd)
+              if(this.listAdd[j].contractId == '' || this.listAdd[j].contractId == undefined || parseFloat(this.listAdd[j].contractId) == 0 || parseFloat(this.listAdd[j].contractId) < 0){
                 // var rulesPrice = /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/
                 var rulesPrice = /(^[1-9](\d+)?(\.\d{1,5})?$)|(^\d\.\d{1,5}$)/
                 if (rulesPrice.test(this.listAdd[j].price) == false) {
                   this.$message({ type: 'error', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
                   return false
-                }
+                }
               }
             }
           }
         }
         for(let i=0;i<this.listAdd.length;i++){
-          this.$set(this.listAdd[i],'date',this.createTemp.createTime)
+          this.$set(this.listAdd[i],'date',parseTime(this.createTemp.createTime, '{y}-{m}-{d} {h}:{i}:{s}'))
           this.$set(this.listAdd[i],'employeId',this.createTemp.employeId)
           if(this.listAdd[i].reject){
             this.$set(this.listAdd[i],'reject',this.listAdd[i].reject)
@@ -3016,7 +3080,7 @@ export default {
       this.$refs['examineTemp'].validate(valid => {
         if (valid) {
           this.requestParam = {}
-          this.requestParam.name = 'partpurchaseFinanceId'
+          this.requestParam.name = 'partpurchasePosition'
           this.requestParam.parammaps = {}
           this.requestParam.parammaps.id = this.examineTemp.id
           if (this.examineTemp.statue == 1) {
@@ -3024,7 +3088,7 @@ export default {
           } else if (this.examineTemp.statue == 2) {
             this.requestParam.parammaps.statue = 16
           }
-          this.requestParam.parammaps.financeId	 = Cookies.get('employeid')
+          this.requestParam.parammaps.empId	 = Cookies.get('employeid')
           this.requestParam.parammaps.workflowNote = this.examineTemp.workflowNote
           PostDataByName(this.requestParam).then(response => {
             console.log('审核确认发送参数', this.requestParam)
@@ -3048,6 +3112,7 @@ export default {
       })
     },
     handle_specialSubscription(){
+      this.getdataListSee.parammaps.id = ''
       this.resetCreateTemp()
       this.listAdd = []
       this.createTemp.purchaseType = '1'
@@ -3082,7 +3147,9 @@ export default {
     },
     changeType(){
       if(this.createTemp.purchaseType == 1){
-        this.getBigPartpurchase(parseInt(this.createTemp.purchaseType))
+        // setTimeout(()=>{
+          this.getBigPartpurchase(parseInt(this.createTemp.purchaseType))
+        // },30000)
       }else{
         this.createTemp.orderNumber = ''
         this.getCreateNumber()
@@ -3131,21 +3198,21 @@ export default {
             }
           }
           if(this.createTemp.purchaseType == '2'){
-            if (this.createTemp.providerId !== '') {
-              if (this.listAdd[j].price == '') {
-                this.$message({ type: 'warning', message: '请检查单价是否为空', duration: 2000 })
+            if (this.listAdd[j].price == '') {
+              this.$message({ type: 'warning', message: '请检查单价是否为空', duration: 2000 })
+              return false
+            } else {
+              if (parseFloat(this.listAdd[j].price) == 0) {
+                this.$message({ type: 'warning', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
                 return false
-              } else {
-                if (parseFloat(this.listAdd[j].price) == 0) {
-                  this.$message({ type: 'warning', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
-                  return false
-                } else {
+              } else {
+                if(this.listAdd[j].contractId == '' || this.listAdd[j].contractId == undefined || parseFloat(this.listAdd[j].contractId) == 0 || parseFloat(this.listAdd[j].contractId) < 0){
                   // var rulesPrice = /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/
                   var rulesPrice = /(^[1-9](\d+)?(\.\d{1,5})?$)|(^\d\.\d{1,5}$)/
                   if (rulesPrice.test(this.listAdd[j].price) == false) {
                     this.$message({ type: 'error', message: '价格请输入正数,最多保留小数点后五位', duration: 2000 })
                     return false
-                  }
+                  }
                 }
               }
             }
@@ -3191,7 +3258,7 @@ export default {
                 "lifeCycle":  this.listAdd[i].lifeCycle.toString(),
                 "contractVarianceItem":  this.listAdd[i].contractVarianceItem.toString(),
                 "departmentId": this.createTemp.departmentId.toString(),
-                "date": this.createTemp.createTime.toString(),
+                "date": parseTime(this.createTemp.createTime, '{y}-{m}-{d} {h}:{i}:{s}').toString(),
                 "employeId": parseFloat(this.createTemp.employeId)
               }
               if(this.listAdd[i].contractId){
@@ -3250,7 +3317,7 @@ export default {
         for(let i=0;i<this.listAdd.length;i++){
           this.$set(this.listAdd[i],'contractId',String(this.listAdd[i].contractId))
           this.$set(this.listAdd[i],'departmentId',String(this.createTemp.departmentId))
-          this.$set(this.listAdd[i],'date',this.createTemp.createTime)
+          this.$set(this.listAdd[i],'date',parseTime(this.createTemp.createTime, '{y}-{m}-{d} {h}:{i}:{s}'))
           this.$set(this.listAdd[i],'employeId',String(this.createTemp.employeId))
         }
         let data = {
@@ -3258,7 +3325,7 @@ export default {
           "departmentId": parseInt(this.createTemp.departmentId),
           'departmentName':this.createTemp.departmentName,
           "orderNumber": this.createTemp.orderNumber,
-          "createTime": this.createTemp.createTime,
+          "createTime": parseTime(this.createTemp.createTime, '{y}-{m}-{d} {h}:{i}:{s}'),
           "employeId": this.createTemp.employeId,
           "providerName": this.createTemp.providerName,
           "purchaseType": parseInt(this.createTemp.purchaseType),