Browse Source

Merge branch 'master' into feature/QueryRepair

duanxiaoduan 1 year ago
parent
commit
57da1a66d0

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 1 - 0
src/icons/svg/sap日志.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1704352357783" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8718" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M311.2 288H682v64H311.2zM311.2 480H682v64H311.2zM311.2 672H682v64H311.2z" fill="#ffffff" p-id="8719"></path><path d="M960 512c0-59.4-39.5-109.1-92.7-123.4V192c0-52.9-41.6-96-92.7-96H218.5c-51.1 0-92.7 43.1-92.7 96v160H64v64h61.8v192H64v64h61.8v160c0 52.9 41.6 96 92.7 96h556.1c51.1 0 92.7-43.1 92.7-96V635.4c53.2-14.3 92.7-64 92.7-123.4zM774.6 864H218.5c-17 0-30.9-14.4-30.9-32V672h61.8v-64h-61.8V416h61.8v-64h-61.8V192c0-17.6 13.8-32 30.9-32h556.1c17 0 30.9 14.4 30.9 32v196.6c-53.2 14.3-92.7 64-92.7 123.4s39.5 109.1 92.7 123.4V832c0 17.6-13.8 32-30.9 32z m61.8-288c-34.1 0-61.8-28.7-61.8-64s27.7-64 61.8-64c34.1 0 61.8 28.7 61.8 64s-27.7 64-61.8 64z" fill="#ffffff" p-id="8720"></path></svg>

+ 1 - 0
src/icons/svg/冲销.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1704352222014" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7663" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M926.647887 126.197183h-288.450704c0-72.112676-57.690141-126.197183-126.197183-126.197183s-126.197183 57.690141-126.197183 126.197183h-288.450704c-18.028169 0-32.450704 14.422535-32.450705 32.450704v829.295775c0 18.028169 14.422535 32.450704 32.450705 32.450704h829.295774c18.028169 0 32.450704-14.422535 32.450705-32.450704v-829.295775c0-18.028169-14.422535-32.450704-32.450705-32.450704zM512 64.901408c36.056338 0 64.901408 28.84507 64.901408 64.901409s-28.84507 64.901408-64.901408 64.901408-64.901408-28.84507-64.901408-64.901408 28.84507-64.901408 64.901408-64.901409z m382.197183 894.197184H126.197183V191.098592H252.394366V288.450704c0 18.028169 14.422535 32.450704 32.450704 32.450704h447.098592c18.028169 0 32.450704-14.422535 32.450704-32.450704V191.098592h126.197183v768z" p-id="7664" fill="#ffffff"></path><path d="M692.28169 530.028169c-43.267606 0-79.323944 36.056338-79.323944 79.323944 0 43.267606 36.056338 79.323944 79.323944 79.323943 43.267606 0 79.323944-36.056338 79.323944-79.323943 0-43.267606-36.056338-79.323944-79.323944-79.323944z m0-61.295775c79.323944 0 140.619718 64.901408 140.619718 140.619719s-64.901408 140.619718-140.619718 140.619718-140.619718-64.901408-140.619718-140.619718S612.957746 468.732394 692.28169 468.732394zM183.887324 609.352113C183.887324 530.028169 248.788732 468.732394 324.507042 468.732394s140.619718 64.901408 140.619719 140.619719-64.901408 140.619718-140.619719 140.619718-140.619718-61.295775-140.619718-140.619718z" p-id="7665" fill="#ffffff"></path></svg>

+ 1 - 0
src/icons/svg/资产盘点.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1704352124059" class="icon" viewBox="0 0 1030 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4584" xmlns:xlink="http://www.w3.org/1999/xlink" width="32.1875" height="32"><path d="M563.2 314.368H252.416c-15.36 0-28.16-12.8-28.16-28.16s12.8-28.16 28.16-28.16H563.2c15.36 0 28.16 12.8 28.16 28.16s-12.8 28.16-28.16 28.16zM563.2 457.728H252.416c-15.36 0-28.16-12.8-28.16-28.16s12.8-28.16 28.16-28.16H563.2c15.36 0 28.16 12.8 28.16 28.16s-12.8 28.16-28.16 28.16zM630.784 900.096c-103.936 0-188.928-84.992-188.928-188.928s84.992-188.928 188.928-188.928 188.928 84.992 188.928 188.928-84.992 188.928-188.928 188.928z m0-321.536c-73.216 0-132.608 59.392-132.608 132.608s59.392 132.608 132.608 132.608 132.608-59.392 132.608-132.608-59.392-132.608-132.608-132.608z" p-id="4585"></path><path d="M875.52 999.424c-7.68 0-15.36-3.072-20.992-9.216l-130.56-145.92c-10.24-11.776-9.216-29.184 2.048-39.936 11.776-10.24 29.184-9.216 39.936 2.048l130.56 145.92c10.24 11.776 9.216 29.184-2.048 39.936-5.632 4.608-12.288 7.168-18.944 7.168zM322.56 1005.056H43.52c-14.336 0-25.6-11.264-25.6-25.6V35.84c0-14.336 11.264-25.6 25.6-25.6h733.696c14.336 0 25.6 11.264 25.6 25.6v276.992c0 14.336-11.264 25.6-25.6 25.6s-25.6-11.264-25.6-25.6V61.44H69.12v892.416H322.56c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6z" p-id="4586"></path></svg>

+ 4 - 4
src/views/asset/assetinventory/index.vue

@@ -84,8 +84,8 @@
             </el-row>
             <el-row>
               <el-col :span="6">
-                <el-form-item label="资产编号:" prop="eqCode">
-                  <el-input ref="eqCode" v-model="see.temp.eqCode" placeholder="资产编号" disabled />
+                <el-form-item label="设备内部编号:" prop="assetCode">
+                 <el-input ref="assetCode" v-model="see.temp.assetCode" placeholder="设备内部编号" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -94,8 +94,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="设备内部编号:" prop="assetCode">
-                 <el-input ref="assetCode" v-model="see.temp.assetCode" placeholder="设备内部编号" disabled />
+                <el-form-item label="资产编号:" prop="eqCode">
+                  <el-input ref="eqCode" v-model="see.temp.eqCode" placeholder="资产编号" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="6">

+ 172 - 17
src/views/custom/subscribe/index.vue

@@ -186,6 +186,174 @@
                 <el-input ref="providerName" v-model="createTemp.providerName" disabled />
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="16">
+              <el-form-item label="备件:" prop="partCode">
+                <el-autocomplete
+                  v-model="createTemp.partCode"
+                  value-key="name"
+                  class="inline-input"
+                  :fetch-suggestions="sparePartSearch"
+                  placeholder="请输入备件编号或备件名称或备件规格"
+                  style="width:100%"
+                  ref="autocomplete"
+                  @select="handleSelectSparePart"
+                >
+                  <template slot-scope="{ item }">
+                    <b>备件编号:</b><div class="name" style="display: inline;">{{ item.partCode }}</div>&nbsp;
+                    |  &nbsp;<b>备件名称:</b><span class="addr">{{ item.partName }}</span>&nbsp;
+                    |  &nbsp;<b>备件规格:</b><span class="addr">{{ item.specification }}</span>
+                  </template>
+                </el-autocomplete>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-table
+          :key="tableKey"
+          v-loading="listLoading"
+          element-loading-text="给我一点时间"
+          :data="listAdd"
+          border
+          fit
+          highlight-current-row
+          style="width: 100%;margin-bottom:30px"
+          :row-style="rowStyle"
+          :cell-style="cellStyle"
+          class="elTable"
+        >
+          <!-- table表格 -->
+          <el-table-column label="序号" align="center" type="index" width="50px" />
+          <el-table-column label="备件编号" prop="partCode" align="center" min-width="90">
+            <template slot-scope="scope">
+              <span>{{ scope.row.partCode }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备件名称" prop="partName" align="center" min-width="90">
+            <template slot-scope="scope">
+              <span>{{ scope.row.partName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备件规格" prop="specification" min-width="80px" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.specification }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备件图片" prop="picpath" min-width="110px" align="center">
+            <template slot-scope="scope">
+              <el-popover placement="right" title="" trigger="hover">
+                <img v-if="scope.row.picpath !== ''" :src="scope.row.picpath">
+                <img v-if="scope.row.picpath !== ''" slot="reference" :src="scope.row.picpath" :alt="scope.row.srcpath" style="height: 100px;width:100px;">
+              </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==='create'">{{ scope.row.brandName }}</span>
+              <span v-if="dialogStatus==='update'">{{ scope.row.brandName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="计量单位" prop="unit" align="center" min-width="60">
+            <template slot-scope="scope">
+              <span>{{ scope.row.unit }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="现有库存" prop="reportery" align="center" min-width="60">
+            <template slot-scope="scope">
+              <span v-if="createTemp.providerId == '' || parseFloat(createTemp.purchaseType) > 0">{{ scope.row.reportery }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="价格" prop="price" align="center" min-width="60">
+            <template slot-scope="scope">
+              <span v-if="createTemp.providerId == ''">{{ scope.row.price }}</span>
+              <el-form v-else :model="scope.row" :rules="rules">
+                <el-form-item prop="price">
+                  <el-input v-model="scope.row.price" style="margin-top:15px" />
+                </el-form-item>
+              </el-form>
+            </template>
+          </el-table-column>
+          <el-table-column label="申购数量" min-width="120px" align="center" valign="middle">
+            <template slot-scope="scope">
+              <el-form :model="scope.row" :rules="rules">
+                <el-form-item prop="amount">
+                  <el-input v-model="scope.row.amount" style="margin-top:15px" />
+                </el-form-item>
+              </el-form>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" min-width="110px" align="center" valign="middle">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.purpose" />
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="使用周期" min-width="120px" align="center" prop="lifeCycle" />
+          <el-table-column label="合同差异项" min-width="120px" align="center" prop="contractVarianceItem" /> -->
+          <el-table-column
+            label="操作"
+            align="center"
+            width="100"
+            class-name="small-padding fixed-width"
+            fixed="right"
+          >
+            <template slot-scope="{row}">
+              <a class="del" @click="partDelete(row)">删除</a>
+            </template>
+          </el-table-column>
+        </el-table>
+        <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()">取消并关闭</el-button>
+        </div>
+      </div>
+    </el-dialog>
+    <!-- 特殊申购 -->
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible2" :close-on-click-modal="false" width="90%">
+      <div class="app-container">
+        <el-form
+          ref="createTemp"
+          :rules="rules"
+          :model="createTemp"
+          label-position="right"
+          label-width="100px"
+          style="width: 90%;margin:0 auto;"
+        >
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="申购单号:" prop="orderNumber">
+                <el-input ref="orderNumber" v-model="createTemp.orderNumber" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="牧场:" prop="pastureId">
+                <el-select v-model="createTemp.pastureId" placeholder="牧场" class="filter-item" style="width:100%" :disabled="dialogStatus==='update'" @change="changePasture">
+                  <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="申购部门:" prop="departmentId">
+                <el-select v-model="createTemp.departmentId" placeholder="申购部门" class="filter-item" style="width:100%" :disabled="dialogStatus==='update'" @change="changeDepart">
+                  <el-option v-for="item in createDepartList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="申购人:" prop="employeId">
+                <el-select v-model="createTemp.employeId" placeholder="申购人" class="filter-item" style="width:100%" :disabled="dialogStatus==='update'">
+                  <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </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-form-item>
+            </el-col>
             <el-col v-if="dialogStatus==='special' && createTemp.purchaseType == '1' || createTemp.purchaseType == '3'" :span="8">
               <el-form-item label="供应商:" prop="providerId">
                 <el-select v-model="createTemp.providerId" filterable placeholder="供应商" class="filter-item" style="width:100%" :disabled="dialogStatus==='update'">
@@ -281,8 +449,6 @@
           </el-table-column>
           <el-table-column label="备件品牌" prop="brand" align="center" min-width="60">
             <template slot-scope="scope">
-              <span v-if="dialogStatus==='create'">{{ scope.row.brandName }}</span>
-              <span v-if="dialogStatus==='update'">{{ scope.row.brandName }}</span>
               <span v-if="dialogStatus==='special'">{{ scope.row.brandName }}</span>
             </template>
           </el-table-column>
@@ -306,16 +472,6 @@
               </el-form>
             </template>
           </el-table-column>
-          <el-table-column v-else label="价格" prop="price" align="center" min-width="60">
-            <template slot-scope="scope">
-              <span v-if="createTemp.providerId == ''">{{ scope.row.price }}</span>
-              <el-form v-else :model="scope.row" :rules="rules">
-                <el-form-item prop="price">
-                  <el-input v-model="scope.row.price" style="margin-top:15px" />
-                </el-form-item>
-              </el-form>
-            </template>
-          </el-table-column>
           <el-table-column label="申购数量" min-width="120px" align="center" valign="middle">
             <template slot-scope="scope">
               <el-form :model="scope.row" :rules="rules">
@@ -345,10 +501,8 @@
           </el-table-column>
         </el-table>
         <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 type="primary" :disabled="isokDisable" v-else-if="dialogStatus==='special'" @click="special_dialog_save()">保存并关闭</el-button>
-          <el-button @click="dialogFormVisible = false;get_table_data()">取消并关闭</el-button>
+          <el-button type="primary" :disabled="isokDisable" v-if="dialogStatus==='special'" @click="special_dialog_save()">保存并关闭</el-button>
+          <el-button @click="dialogFormVisible2 = false;get_table_data()">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -714,6 +868,7 @@ export default {
       list: [],
       dialogStatus: '',
       dialogFormVisible: false,
+      dialogFormVisible2: false,
       dialogFormVisibleSee: false,
       listLoadingSee: true,
       listSee: [],
@@ -2198,7 +2353,7 @@ export default {
       this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
       this.getCreateDepartDownList()
       this.dialogStatus = 'special'
-      this.dialogFormVisible = true
+      this.dialogFormVisible2 = true
       this.$nextTick(() => {
         this.$refs['createTemp'].clearValidate()
       })

+ 34 - 26
src/views/maintenance/subcontractingMainten/tabPage/tab2.vue

@@ -614,7 +614,7 @@
             <template slot-scope="scope">
               <el-form :model="scope.row">
                 <el-form-item prop="amount">
-                  <el-input ref="amount" v-model="scope.row.amount" :disabled="dialogStatus==='collectionSparePartsSee'" style="margin-top:15px" />
+                  <el-input ref="amount" v-model="scope.row.amount" :disabled="dialogStatus==='collectionSparePartsSee1'" style="margin-top:15px" />
                 </el-form-item>
               </el-form>
             </template>
@@ -628,7 +628,7 @@
             <template slot-scope="scope">
               <el-form :model="scope.row">
                 <el-form-item prop="note">
-                  <el-input ref="note" v-model="scope.row.note" :disabled="dialogStatus==='collectionSparePartsSee'" style="margin-top:15px" />
+                  <el-input ref="note" v-model="scope.row.note" :disabled="dialogStatus==='collectionSparePartsSee1'" style="margin-top:15px" />
                 </el-form-item>
               </el-form>
             </template>
@@ -921,6 +921,7 @@ export default {
         examine33: '审核4',
         examine3: '审核5',
         collectionSparePartsSee: '查看领用',
+        collectionSparePartsSee1:'查看领用',
         collectionSparePartsCreate: '添加领用',
       },
 
@@ -1113,7 +1114,7 @@ export default {
     handleCollarUseSee(row, isStock) {
       console.log(row)
       this.collectionSparePartsSeeTemp = Object.assign({}, row)
-      // this.dialogStatus = 'collectionSparePartsSee'
+      this.dialogStatus = 'collectionSparePartsSee1'
 
       this.collectionSparePartsSeeTemp.applyDate = row.createDate
       this.dialogFormVisible_CollectionSparePartsSee = true
@@ -1574,6 +1575,9 @@ export default {
                       this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
                     }
                   })
+                  setTimeout(() => {
+                    this.isokDisable = false
+                  }, 2000)
                   return true
                 }
               } else {
@@ -1664,7 +1668,7 @@ export default {
 
         this.collectionSparePartsSeeTemp.empId =  this.collectionSparePartsSeeTemp.applicant
         this.collectionSparePartsSeeTemp.applyDate = parseTime(new Date(), '{y}-{m}-{d}')
-        // this.dialogStatus = 'collectionSparePartsCreate'
+        this.dialogStatus = 'collectionSparePartsSee'
         this.dialogFormVisible_CollectionSparePartsSee = true
         this.isCreatePartDelete = true
         this.listCreateCollectionSpareParts = []
@@ -2269,29 +2273,33 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        var send_data1 = {
-            "name": "checkOutsourcingAmount",
-            "parammaps": { "outsourcingCode":row.outsourcingCode }
-        }
-        var send_data2 = {
-        "common": { "returnmap": "0" },
-        "data": [
-          {
-            "name": "editBigacceptanceIsAcceptance", "type": "e",
-            "parammaps": { "id":row.id }
-           }
-          ]
-        }
-        GetDataByName(send_data1).then(response => {
-          if(parseFloat(response.data.list[0].amount) !== 0){
-            this.save_submit(send_data2)
-          }else{
-            this.$message({
-              type: 'error',
-              message: '数据未填写,请完善相关信息'
-            })
+        if(row.isPartapply == 1){
+          var send_data1 = {
+              "name": "checkOutsourcingAmount",
+              "parammaps": { "outsourcingCode":row.outsourcingCode }
           }
-        })
+          var send_data2 = {
+          "common": { "returnmap": "0" },
+          "data": [
+            {
+              "name": "editBigacceptanceIsAcceptance", "type": "e",
+              "parammaps": { "id":row.id }
+             }
+            ]
+          }
+          GetDataByName(send_data1).then(response => {
+            if(parseFloat(response.data.list[0].amount) !== 0){
+              this.save_submit(send_data2)
+            }else{
+              this.$message({
+                type: 'error',
+                message: '数据未填写,请完善相关信息'
+              })
+            }
+          })
+        }else{
+          this.$message({ type: 'warning', message: '备件未领用,暂时不能提交。', duration: 2000 })
+        }
       }).catch(() => {
         this.$message({
           type: 'info',

Some files were not shown because too many files changed in this diff